Commit bb2f8131 by Maarten L. Hekkelman

Newer CMakeLists.txt file, now creating more correct config files.

parent ec91d0fb
...@@ -151,6 +151,15 @@ install(FILES ...@@ -151,6 +151,15 @@ install(FILES
) )
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
set(INCLUDE_INSTALL_DIR include )
set(LIBRARY_INSTALL_DIR lib )
configure_package_config_file(cmake/cifppConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake
INSTALL_DESTINATION lib/cmake/cifpp
PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR SHARE_INSTALL_DIR)
write_basic_package_version_file( write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfigVersion.cmake"
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
...@@ -159,12 +168,7 @@ write_basic_package_version_file( ...@@ -159,12 +168,7 @@ write_basic_package_version_file(
export(EXPORT cifppTargets export(EXPORT cifppTargets
FILE "${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppTargets.cmake" FILE "${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppTargets.cmake"
NAMESPACE CifPP:: NAMESPACE cifpp::
)
configure_file(cmake/cifppConfig.cmake
"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake"
COPYONLY
) )
set(ConfigPackageLocation lib/cmake/cifpp) set(ConfigPackageLocation lib/cmake/cifpp)
...@@ -172,15 +176,15 @@ install(EXPORT cifppTargets ...@@ -172,15 +176,15 @@ install(EXPORT cifppTargets
FILE FILE
cifppTargets.cmake cifppTargets.cmake
NAMESPACE NAMESPACE
CifPP:: cifpp::
DESTINATION DESTINATION
${ConfigPackageLocation} ${ConfigPackageLocation}
) )
install( install(
FILES FILES
cmake/cifppConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifppConfigVersion.cmake"
DESTINATION DESTINATION
${ConfigPackageLocation} ${ConfigPackageLocation}
COMPONENT COMPONENT
......
include("${CMAKE_CURRENT_LIST_DIR}/cifppTargets.cmake")
# set(cifpp_VERSION @VERSION@)
@PACKAGE_INIT@
INCLUDE("${CMAKE_CURRENT_LIST_DIR}/cifppTargets.cmake")
set_and_check(CIFPP_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
set_and_check(CIFPP_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
set_and_check(CIFPP_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
check_required_components(cifpp)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment