Skip to content

Commit 0e95abd

Browse files
committed
[cmake] Move SwiftApplyXcodeSubstitutions.cmake => SwiftXcodeSupport.cmake.
As an additional fix, this moves the include of SwiftXcodeSupport to the one place where its functionality is used, AddSwift.cmake. Keeping the include in ./CMakeLists.txt makes it seem like the functionality is needed there (when it is not). In a subsequent commit, I am going to refactor the xcode support I have been adding to SwiftSharedCMakeConfig into this file and have SwiftSharedCMakeConfig import it.
1 parent b9adb29 commit 0e95abd

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ include(AddSwift)
356356
include(SwiftConfigureSDK)
357357
include(SwiftInstallComponents)
358358
include(SwiftGetConfigurationTypes)
359-
include(SwiftApplyXcodeSubstitutions)
360359
include(SwiftList)
361360

362361
swift_configure_install_components("${SWIFT_INSTALL_COMPONENTS}")

cmake/modules/AddSwift.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include(SwiftList)
2+
include(SwiftXcodeSupport)
23

34
# SWIFTLIB_DIR is the directory in the build tree where Swift resource files
45
# should be placed. Note that $CMAKE_CFG_INTDIR expands to "." for

cmake/modules/SwiftApplyXcodeSubstitutions.cmake renamed to cmake/modules/SwiftXcodeSupport.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file contains cmake configuration specifically related to support for the
2+
# Xcode generator in CMake.
3+
14
function(apply_xcode_substitutions config path result_var_name)
25
# Hack to deal with the fact that paths contain the build-time
36
# variables. Note that this fix is Xcode-specific.

0 commit comments

Comments
 (0)