[cmake] Refactor out unittest configuration logic from unittests/CMakeLists.txt => cmake/modules/AddSwiftUnittests.cmake.

rdar://24717107

Author: gottesmm

cmake/modules/AddSwiftUnittests.cmake

@@ -0,0 +1,45 @@
+
+include(AddSwift)
+
+add_custom_target(SwiftUnitTests)
+
+set_target_properties(SwiftUnitTests PROPERTIES FOLDER "Tests")
+
+function(add_swift_unittest test_dirname)
+  # *NOTE* Even though "add_unittest" does not have llvm in its name, it is a
+  # function defined by AddLLVM.cmake.
+  add_unittest(SwiftUnitTests ${test_dirname} ${ARGN})
+
+  if(SWIFT_BUILT_STANDALONE AND NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+    # Replace target references with full paths, so that we use LLVM's
+    # build configuration rather than Swift's.
+    get_target_property(libnames ${test_dirname} LINK_LIBRARIES)
+
+    set(new_libnames)
+    foreach(dep ${libnames})
+      if("${dep}" MATCHES "^(LLVM|Clang|gtest)")
+        list(APPEND new_libnames "${LLVM_LIBRARY_OUTPUT_INTDIR}/lib${dep}.a")
+      else()
+        list(APPEND new_libnames "${dep}")
+      endif()
+    endforeach()
+
+    set_property(TARGET ${test_dirname} PROPERTY LINK_LIBRARIES ${new_libnames})
+    swift_common_llvm_config(${test_dirname} support)
+  endif()
+
+  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+    set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
+      LINK_FLAGS " -Xlinker -rpath -Xlinker ${SWIFT_LIBRARY_OUTPUT_INTDIR}/swift/macosx")
+
+    if(SWIFT_ANALYZE_CODE_COVERAGE)
+      set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
+        LINK_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
+    endif()
+  elseif(${SWIFT_ENABLE_GOLD_LINKER})
+    set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
+      LINK_FLAGS " -fuse-ld=gold")
+  endif()
+endfunction()
+
+

unittests/CMakeLists.txt

@@ -1,41 +1,5 @@
-add_custom_target(SwiftUnitTests)
 
-set_target_properties(SwiftUnitTests PROPERTIES FOLDER "Tests")
-
-function(add_swift_unittest test_dirname)
-  add_unittest(SwiftUnitTests ${test_dirname} ${ARGN})
-
-  if(SWIFT_BUILT_STANDALONE AND NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
-    # Replace target references with full paths, so that we use LLVM's
-    # build configuration rather than Swift's.
-    get_target_property(libnames ${test_dirname} LINK_LIBRARIES)
-
-    set(new_libnames)
-    foreach(dep ${libnames})
-      if("${dep}" MATCHES "^(LLVM|Clang|gtest)")
-        list(APPEND new_libnames "${LLVM_LIBRARY_OUTPUT_INTDIR}/lib${dep}.a")
-      else()
-        list(APPEND new_libnames "${dep}")
-      endif()
-    endforeach()
-
-    set_property(TARGET ${test_dirname} PROPERTY LINK_LIBRARIES ${new_libnames})
-    swift_common_llvm_config(${test_dirname} support)
-  endif()
-
-  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-    set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
-      LINK_FLAGS " -Xlinker -rpath -Xlinker ${SWIFT_LIBRARY_OUTPUT_INTDIR}/swift/macosx")
-
-    if(SWIFT_ANALYZE_CODE_COVERAGE)
-      set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
-        LINK_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
-    endif()
-  elseif(${SWIFT_ENABLE_GOLD_LINKER})
-    set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
-      LINK_FLAGS " -fuse-ld=gold")
-  endif()
-endfunction()
+include(AddSwiftUnittests)
 
 if(SWIFT_BUILD_TOOLS)
   # We can't link C++ unit tests unless we build the tools.