commit c8e9ee00

sum01 · 2018-06-21 15:16
c8e9ee0044a245ec478f47b02cd40e7b84bbdb1e patch · browse files
parent 2e81279d8d0804717906c870cd7525eaa2a93069

Removes unnecessary cmake.in file

Since no dependencies are needed after compile-time (CoreServices is PRIVATE) we don't need its special logic.
This installs an auto-generated platform_foldersConfig.cmake file instead.

Changed files

M	CMakeLists.txt before
D	platform_foldersConfig.cmake.in before

diff --git a/CMakeLists.txt b/CMakeLists.txt index af90733..519db44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -79,7 +79,7 @@ endif()

# Gives "Make install" esque operations a location to install to...

# and creates a .cmake file to be exported

install(TARGETS platform_folders

- EXPORT "platform_folders-targets"

+ EXPORT "platform_foldersConfig"

LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

# Tells it where to put the header files

@@ -88,7 +88,7 @@ install(TARGETS platform_folders

# "The install(TARGETS) and install(EXPORT) commands work together to install a target and a file to help import it"

# Installs a cmake file which external projects can import.

-install(EXPORT "platform_folders-targets"

+install(EXPORT "platform_foldersConfig"

NAMESPACE sago::

DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"

)

@@ -103,12 +103,6 @@ export(TARGETS platform_folders

# For the config and configversion macros

include(CMakePackageConfigHelpers)

-configure_package_config_file("platform_foldersConfig.cmake.in"

- "${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfig.cmake"

- # Tells the config file where it will be installed, so it can be correctly imported

- INSTALL_DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"

# Creates the project's ConfigVersion.cmake file

# This allows for find_package() to use a version in the call

write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfigVersion.cmake"

@@ -120,7 +114,6 @@ write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/platform_foldersCo

# Install the ConfigVersion file, which is located in the build dir

install(FILES

- "${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfig.cmake"

"${CMAKE_CURRENT_BINARY_DIR}/platform_foldersConfigVersion.cmake"

DESTINATION "${_PROJECT_INSTALL_CMAKE_DIR}"

)

diff --git a/platform_foldersConfig.cmake.in b/platform_foldersConfig.cmake.in deleted file mode 100644 index f4a7964..0000000 --- a/platform_foldersConfig.cmake.in +++ /dev/null

@@ -1,3 +0,0 @@

-@PACKAGE_INIT@

-include("${CMAKE_CURRENT_LIST_DIR}/platform_folders-targets.cmake")