[cmake] Follow LLVM/Clang's example and use add_llvm_subdirectory and invoke add_llvm_subdirectory when adding tools/libs. This allows us to selectively disable the building of tools by setting the variable SWIFT_{TOOL,LIB}_XXX_BUILD=OFF.

This is done by introducing the macros: add_swift_{lib,tool}_subdirectory.

Author: gottesmm

cmake/modules/AddSwift.cmake

@@ -1759,3 +1759,11 @@ function(add_swift_executable name)
       ${SWIFTEXE_DONT_STRIP_NON_MAIN_SYMBOLS_FLAG}
       ${SWIFTEXE_DISABLE_ASLR_FLAG})
 endfunction()
+
+macro(add_swift_tool_subdirectory name)
+  add_llvm_subdirectory(SWIFT TOOL ${name})
+endmacro()
+
+macro(add_swift_lib_subdirectory name)
+  add_llvm_subdirectory(SWIFT LIB ${name})
+endmacro()

tools/CMakeLists.txt

@@ -1,12 +1,12 @@
-add_subdirectory(driver)
-add_subdirectory(sil-opt)
-add_subdirectory(swift-ide-test)
-add_subdirectory(swift-remoteast-test)
-add_subdirectory(swift-demangle)
-add_subdirectory(lldb-moduleimport-test)
-add_subdirectory(sil-extract)
-add_subdirectory(swift-llvm-opt)
+add_swift_tool_subdirectory(driver)
+add_swift_tool_subdirectory(sil-opt)
+add_swift_tool_subdirectory(swift-ide-test)
+add_swift_tool_subdirectory(swift-remoteast-test)
+add_swift_tool_subdirectory(swift-demangle)
+add_swift_tool_subdirectory(lldb-moduleimport-test)
+add_swift_tool_subdirectory(sil-extract)
+add_swift_tool_subdirectory(swift-llvm-opt)
 
 if(SWIFT_BUILD_SOURCEKIT)
-  add_subdirectory(SourceKit)
+  add_swift_tool_subdirectory(SourceKit)
 endif()

tools/SourceKit/tools/CMakeLists.txt

@@ -4,7 +4,7 @@ include_directories(
   ${SOURCEKITD_SOURCE_DIR}/include
 )
 
-add_subdirectory(sourcekitd)
-add_subdirectory(sourcekitd-test)
-add_subdirectory(sourcekitd-repl)
-add_subdirectory(complete-test)
+add_swift_lib_subdirectory(sourcekitd)
+add_swift_tool_subdirectory(sourcekitd-test)
+add_swift_tool_subdirectory(sourcekitd-repl)
+add_swift_tool_subdirectory(complete-test)