[cmake] Rename SWIFT_BUILD_TOOLS => SWIFT_INCLUDE_TOOLS

In LLVM, the convention is that *_INCLUDE_* means that cmake will generate
targets but says nothing about whether or not something will be built by default
or not. This means that as far as cmake is concerned, those targets do not
exist.

On the other hand, *_BUILD_* determines whether or not a class of things is a
dependency of the "all" target. Of course this implies that *_BUILD_* implies
that *_INCLUDE_* must be set to TRUE.

Currently SWIFT_BUILD_TOOLS is implemented like a *_INCLUDE_* option, so change
its name to SWIFT_INCLUDE_TOOLS.

Author: gottesmm

CMakeLists.txt

@@ -16,8 +16,8 @@ list(APPEND CMAKE_MODULE_PATH
 # This is primarily to support building smaller or faster project files.
 #
 
-option(SWIFT_BUILD_TOOLS
-    "Build the Swift compiler and other tools"
+option(SWIFT_INCLUDE_TOOLS
+    "Generate build targets for swift tools"
     TRUE)
 
 option(SWIFT_BUILD_REMOTE_MIRROR
@@ -822,14 +822,14 @@ if(NOT DEFINED SWIFT_API_NOTES_INPUTS)
 endif()
 
 # Add all of the subdirectories, where we actually do work.
-if(SWIFT_BUILD_TOOLS)
+if(SWIFT_INCLUDE_TOOLS)
   add_subdirectory(include)
   add_subdirectory(lib)
   add_subdirectory(tools)
 endif()
 
 is_sdk_requested("${SWIFT_HOST_VARIANT_SDK}" SWIFT_HOST_SDK_REQUESTED)
-if(SWIFT_BUILD_TOOLS AND SWIFT_BUILD_STDLIB AND SWIFT_HOST_SDK_REQUESTED)
+if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_STDLIB AND SWIFT_HOST_SDK_REQUESTED)
   add_subdirectory(tools/swift-reflection-dump)
 endif()
 

cmake/modules/SwiftSource.cmake

@@ -320,7 +320,7 @@ function(_compile_swift_files dependency_target_out_var_name)
   set(line_directive_tool "${SWIFT_SOURCE_DIR}/utils/line-directive")
   set(swift_compiler_tool "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc")
   set(swift_compiler_tool_dep)
-  if(SWIFT_BUILD_TOOLS)
+  if(SWIFT_INCLUDE_TOOLS)
     # Depend on the binary itself, in addition to the symlink.
     set(swift_compiler_tool_dep "swift")
   endif()

test/CMakeLists.txt

@@ -92,7 +92,7 @@ if(PYTHONINTERP_FOUND)
 
   set(SWIFT_TEST_EXTRA_ARGS)
 
-  if(NOT SWIFT_BUILD_TOOLS)
+  if(NOT SWIFT_INCLUDE_TOOLS)
     list(APPEND SWIFT_TEST_EXTRA_ARGS
          "--path=${SWIFT_NATIVE_LLVM_TOOLS_PATH}"
          "--path=${SWIFT_NATIVE_CLANG_TOOLS_PATH}"

unittests/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 include(AddSwiftUnittests)
 
-if(SWIFT_BUILD_TOOLS)
+if(SWIFT_INCLUDE_TOOLS)
   # We can't link C++ unit tests unless we build the tools.
 
   add_subdirectory(AST)

utils/build-script-impl

@@ -1959,7 +1959,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DSWIFT_NATIVE_LLVM_TOOLS_PATH:STRING="${native_llvm_tools_path}"
                     -DSWIFT_NATIVE_CLANG_TOOLS_PATH:STRING="${native_clang_tools_path}"
                     -DSWIFT_NATIVE_SWIFT_TOOLS_PATH:STRING="${native_swift_tools_path}"
-                    -DSWIFT_BUILD_TOOLS:BOOL=$(true_false "${BUILD_SWIFT_TOOLS}")
+                    -DSWIFT_INCLUDE_TOOLS:BOOL=$(true_false "${BUILD_SWIFT_TOOLS}")
                     -DSWIFT_BUILD_REMOTE_MIRROR:BOOL=$(true_false "${BUILD_SWIFT_REMOTE_MIRROR}")
                     -DSWIFT_SERIALIZE_STDLIB_UNITTEST:BOOL=$(true_false "${BUILD_SERIALIZED_STDLIB_UNITTEST}")
                     -DSWIFT_STDLIB_SIL_DEBUGGING:BOOL=$(true_false "${BUILD_SIL_DEBUGGING_STDLIB}")