Merge pull request swiftlang#3434 from gottesmm/create_add_swift_subd…

…irectory
danielgalasko · Jul 10, 2016 · 7ae2ea2 · 7ae2ea2
2 parents 23987b2 + 224d763
commit 7ae2ea2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -1763,3 +1763,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()
diff --git a/tools/CMakeLists.txt b/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()
diff --git a/tools/SourceKit/tools/CMakeLists.txt b/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)