Skip to content

Commit 38a5fd6

Browse files
committed
[CMake] Fix generated config install location
The expected install locations for the SwiftCoreConfig.cmake and SwiftCoreTargets.cmake file was inconsistent between the build directory and the install location. Making everything consistent across install locations. In both cases, the files are installed under `./cmake/SwiftCore`. This is one of the formats that `find_package` uses to automatically search for package config files so that we can avoid passing `SwiftCore_DIR` to all sub-projects.
1 parent d7db651 commit 38a5fd6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@ install(EXPORT SwiftCoreTargets
225225
COMPONENT SwiftCore_cmake)
226226
include(CMakePackageConfigHelpers)
227227
configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/interface/SwiftCoreConfig.cmake.in"
228-
"${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfig.cmake"
228+
"${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCore/SwiftCoreConfig.cmake"
229229
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCore")
230-
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfigVersion.cmake"
230+
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCore/SwiftCoreConfigVersion.cmake"
231231
VERSION "${PROJECT_VERSION}"
232232
COMPATIBILITY ExactVersion)
233233
install(FILES
234-
"${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfig.cmake"
235-
"${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfigVersion.cmake"
234+
"${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCore/SwiftCoreConfig.cmake"
235+
"${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCore/SwiftCoreConfigVersion.cmake"
236236
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCore")

Runtimes/Core/cmake/interface/SwiftCoreConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@PACKAGE_INIT@
2-
include("${CMAKE_CURRENT_LIST_DIR}/SwiftCore/SwiftCoreTargets.cmake")
2+
include("${CMAKE_CURRENT_LIST_DIR}/SwiftCoreTargets.cmake")
33

44
set(SwiftCore_ENABLE_LIBRARY_EVOLUTION @SwiftCore_ENABLE_LIBRARY_EVOLUTION@)
55

0 commit comments

Comments
 (0)