Merge pull request #3413 from gottesmm/cmake-refactor-xcode-support

Cmake refactor xcode support

Author: gottesmm

CMakeLists.txt

@@ -356,7 +356,6 @@ include(AddSwift)
 include(SwiftConfigureSDK)
 include(SwiftInstallComponents)
 include(SwiftGetConfigurationTypes)
-include(SwiftApplyXcodeSubstitutions)
 include(SwiftList)
 
 swift_configure_install_components("${SWIFT_INSTALL_COMPONENTS}")

cmake/modules/AddSwift.cmake

@@ -1,4 +1,5 @@
 include(SwiftList)
+include(SwiftXcodeSupport)
 
 # SWIFTLIB_DIR is the directory in the build tree where Swift resource files
 # should be placed.  Note that $CMAKE_CFG_INTDIR expands to "." for
@@ -677,7 +678,7 @@ function(_add_swift_library_single target name)
 
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER ${config} config_upper)
-      apply_xcode_substitutions("${config}" "${SWIFTLIB_DIR}" config_lib_dir)
+      escape_path_for_xcode("${config}" "${SWIFTLIB_DIR}" config_lib_dir)
       set_target_properties(${target} PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${SWIFTLIB_SINGLE_SUBDIR}
         ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${SWIFTLIB_SINGLE_SUBDIR})
@@ -731,7 +732,7 @@ function(_add_swift_library_single target name)
 
     foreach(config ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER ${config} config_upper)
-      apply_xcode_substitutions(
+      escape_path_for_xcode(
           "${config}" "${SWIFTSTATICLIB_DIR}" config_lib_dir)
       set_target_properties(${target_static} PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY_${config_upper} ${config_lib_dir}/${SWIFTLIB_SINGLE_SUBDIR}

cmake/modules/SwiftApplyXcodeSubstitutions.cmake

@@ -12,120 +12,7 @@ else()
   set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
 endif()
 
-function(get_effective_platform_for_triple triple output)
-  string(FIND "${triple}" "macos" IS_MACOS)
-  if (IS_MACOS)
-    set(${output} "" PARENT_SCOPE)
-    return()
-  endif()
-  message(FATAL_ERROR "Not supported")
-endfunction()
-
-# Eliminate $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) from a path.
-#
-# We do not support compiling llvm with an Xcode setting beyond the one that was
-# used with build-script. This allows us to remove those paths. Right now,
-# nothing here is tested for cross compiling with Xcode, but it is in principal
-# possible.
-function(escape_llvm_path_for_xcode path outvar)
-  # First check if we are using Xcode. If not, return early.
-  if (NOT XCODE)
-    set(${outvar} "${path}" PARENT_SCOPE)
-    return()
-  endif()
-
-  get_effective_platform_for_triple("${SWIFT_HOST_TRIPLE}" SWIFT_EFFECTIVE_PLATFORM_NAME)
-  string(REPLACE "$(CONFIGURATION)" "${LLVM_BUILD_TYPE}" path "${path}")
-  string(REPLACE "$(EFFECTIVE_PLATFORM_NAME)" "${SWIFT_EFFECTIVE_PLATFORM_NAME}" path "${path}")
-  set(${outvar} "${path}" PARENT_SCOPE)
-endfunction()
-
-function(get_imported_library_prefix outvar target prefix)
-  string(FIND "${target}" "${prefix}" ALREADY_HAS_PREFIX)
-  if (ALREADY_HAS_PREFIX)
-    set(${outvar} "" PARENT_SCOPE)
-  else()
-    set(${outvar} "${prefix}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(check_imported_target_has_imported_configuration target config)
-  get_target_property(IMPORTED_CONFIGS_LIST ${target} IMPORTED_CONFIGURATIONS)
-  if ("${IMPORTED_CONFIGS_LIST}" STREQUAL "NOTFOUND")
-    message(FATAL_ERROR "No import configuration of ${target} specified?!")
-  endif()
-
-  list(FIND "${IMPORTED_CONFIGS_LIST}" "${config}" FOUND_CONFIG)
-  if (NOT FOUND_CONFIG)
-    message(FATAL_ERROR "${target} does not have imported config '${config}'?! \
-Instead: ${IMPORTED_CONFIGS_LIST}")
-  endif()
-endfunction()
-
-function(fixup_imported_target_property_for_xcode target property real_build_type)
-  set(FULL_PROP_NAME "${property}_${real_build_type}")
-
-  # First try to lookup the value associated with the "real build type".
-  get_target_property(PROP_VALUE ${target} ${FULL_PROP_NAME})
-
-  # If the property is unspecified, return.
-  if ("${PROP_VALUE}" STREQUAL "NOTFOUND")
-    return()
-  endif()
-
-  # Otherwise for each cmake configuration that is not real_build_type, hardcode
-  # its value to be PROP_VALUE.
-  foreach(c ${CMAKE_CONFIGURATION_TYPES})
-    if ("${c}" STREQUAL "${real_build_type}")
-      continue()
-    endif()
-    set_target_properties(${target} PROPERTIES ${FULL_PROP_NAME} "${PROP_VALUE}")
-  endforeach()
-endfunction()
-
-# When building with Xcode, we only support compiling against the LLVM
-# configuration that was specified by build-script. This becomes a problem since
-# if we compile LLVM-Release and Swift-Debug, Swift is going to look in the
-# Debug, not the Release folder for LLVM's code and thus will be compiling
-# against an unintended set of libraries, if those libraries exist at all.
-#
-# Luckily, via LLVMConfig.cmake, we know the configuration that LLVM was
-# compiled in, so we can grab the imported location for that configuration and
-# splat it across the other configurations as well.
-function(fix_imported_targets_for_xcode imported_targets)
-  # This is the set of configuration specific cmake properties that are
-  # supported for imported targets in cmake 3.4.3. Sadly, beyond hacks, it seems
-  # that there is no way to dynamically query the list of set properties of a
-  # target.
-  #
-  # *NOTE* In fixup_imported_target_property_for_xcode, we add the _${CONFIG}
-  # *suffix.
-  set(imported_target_properties
-    IMPORTED_IMPLIB
-    IMPORTED_LINK_DEPENDENT_LIBRARIES
-    IMPORTED_LINK_INTERFACE_LANGUAGES
-    IMPORTED_LINK_INTERFACE_LIBRARIES
-    IMPORTED_LINK_INTERFACE_MULTIPLICITY
-    IMPORTED_LOCATION
-    IMPORTED_NO_SONAME
-    IMPORTED_SONAME)
-
-  foreach(target ${imported_targets})
-    if (NOT TARGET ${target})
-      message(FATAL_ERROR "${target} is not a target?!")
-    endif()
-
-    # First check that we actually imported the configuration that LLVM said
-    # that we did. This is just a sanity check.
-    check_imported_target_has_imported_configuration(${target} ${LLVM_BUILD_TYPE})
-
-    # Then loop through all of the imported properties and translate.
-    foreach(property ${imported_properties})
-      fixup_imported_target_property_for_xcode(
-        ${target} ${property} ${LLVM_BUILD_TYPE})
-    endforeach()
-  endforeach()
-endfunction()
+include(SwiftXcodeSupport)
 
 macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
   option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
@@ -170,14 +57,14 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
   mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
 
   precondition(LLVM_TOOLS_BINARY_DIR)
-  escape_llvm_path_for_xcode("${LLVM_TOOLS_BINARY_DIR}" LLVM_TOOLS_BINARY_DIR)
+  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_TOOLS_BINARY_DIR}" LLVM_TOOLS_BINARY_DIR)
   precondition_translate_flag(LLVM_BUILD_LIBRARY_DIR LLVM_LIBRARY_DIR)
-  escape_llvm_path_for_xcode("${LLVM_LIBRARY_DIR}" LLVM_LIBRARY_DIR)
+  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_LIBRARY_DIR}" LLVM_LIBRARY_DIR)
   precondition_translate_flag(LLVM_BUILD_MAIN_INCLUDE_DIR LLVM_MAIN_INCLUDE_DIR)
   precondition_translate_flag(LLVM_BUILD_BINARY_DIR LLVM_BINARY_DIR)
   precondition_translate_flag(LLVM_BUILD_MAIN_SRC_DIR LLVM_MAIN_SRC_DIR)
   precondition(LLVM_LIBRARY_DIRS)
-  escape_llvm_path_for_xcode("${LLVM_LIBRARY_DIRS}" LLVM_LIBRARY_DIRS)
+  escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${LLVM_LIBRARY_DIRS}" LLVM_LIBRARY_DIRS)
 
   # This could be computed using ${CMAKE_CFG_INTDIR} if we want to link Swift
   # against a matching LLVM build configuration.  However, we usually want to be
@@ -215,7 +102,7 @@ macro(swift_common_standalone_build_config_llvm product is_cross_compiling)
     "Version number that will be placed into the libclang library , in the form XX.YY")
 
   foreach (INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
-    escape_llvm_path_for_xcode("${INCLUDE_DIR}" INCLUDE_DIR)
+    escape_path_for_xcode("${LLVM_BUILD_TYPE}" "${INCLUDE_DIR}" INCLUDE_DIR)
     include_directories(${INCLUDE_DIR})
   endforeach ()
 
@@ -371,45 +258,6 @@ macro(swift_common_unified_build_config product)
   endif()
 endmacro()
 
-# Common additional cmake project config for Xcode.
-#
-macro(swift_common_xcode_cxx_config)
-  # Force usage of Clang.
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0"
-      CACHE STRING "Xcode Compiler")
-  # Use C++'11.
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11"
-      CACHE STRING "Xcode C++ Language Standard")
-  # Use libc++.
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"
-      CACHE STRING "Xcode C++ Standard Library")
-  # Enable some warnings not enabled by default.  These
-  # mostly reset clang back to its default settings, since
-  # Xcode passes -Wno... for many warnings that are not enabled
-  # by default.
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_ABOUT_RETURN_TYPE "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_NEWLINE "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VALUE "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VARIABLE "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_SIGN_COMPARE "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_FUNCTION "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNINITIALIZED_AUTOS "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_DOCUMENTATION_COMMENTS "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_BOOL_CONVERSION "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_EMPTY_BODY "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_ENUM_CONVERSION "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_INT_CONVERSION "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_CONSTANT_CONVERSION "YES")
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_NON_VIRTUAL_DESTRUCTOR "YES")
-
-  # Disable RTTI
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_ENABLE_CPP_RTTI "NO")
-
-  # Disable exceptions
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS "NO")
-endmacro()
-
 # Common cmake project config for additional warnings.
 #
 macro(swift_common_cxx_warnings)