Merge pull request #3203 from gottesmm/small_llvmclang_cmake_integration_cleanups

Small llvmclang cmake integration cleanups

Author: gottesmm

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -84,9 +84,6 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
     "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}" CACHE STRING
     "Version number that will be placed into the libclang library , in the form XX.YY")
 
-  set(CMAKE_INCLUDE_CURRENT_DIR ON)
-  include_directories("${PATH_TO_LLVM_BUILD}/include"
-                      "${LLVM_MAIN_INCLUDE_DIR}")
   foreach (INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
     include_directories(${INCLUDE_DIR})
   endforeach ()
@@ -123,22 +120,14 @@ macro(swift_common_standalone_build_config_clang product is_cross_compiling)
 
   if(NOT EXISTS "${${product}_PATH_TO_CLANG_SOURCE}/include/clang/AST/Decl.h")
     message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_SOURCE to the root directory of Clang's source code.")
-  else()
-    get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
-      ABSOLUTE)
   endif()
+  get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
+    ABSOLUTE)
 
-  if(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/include/clang/Basic/Version.inc")
-    set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/include")
-  elseif(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include/clang/Basic/Version.inc")
-    set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include")
-  else()
+  if(NOT EXISTS "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include/clang/Basic/Version.inc")
     message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_BUILD to a directory containing a Clang build.")
   endif()
-  if(CLANG_MAIN_INCLUDE_DIR)
-    get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
-      ABSOLUTE)
-  endif()
+  set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include")
 
   if (NOT ${is_cross_compiling})
     set(${product}_NATIVE_CLANG_TOOLS_PATH "${PATH_TO_LLVM_TOOLS_BINARY_DIR}")

lib/ClangImporter/CMakeLists.txt

@@ -23,5 +23,7 @@ add_swift_library(swiftClangImporter STATIC
     swiftParse
 )
 
+# Include the current binary dir since we rely on gybed files.
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_dependencies(swiftClangImporter "${generated_include_targets}")

tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

@@ -1,6 +1,9 @@
 set(LLVM_TARGET_DEFINITIONS Options.td)
 swift_tablegen(Options.inc -gen-opt-parser-defs)
 swift_add_public_tablegen_target(sourcekitdTestOptionsTableGen)
+# Add this directories binary directory to the include list to make sure that we
+# can properly include Options.inc.
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
   set(SOURCEKITD_TEST_DEPEND sourcekitdInProc)