File tree Expand file tree Collapse file tree 2 files changed +12
-11
lines changed
Expand file tree Collapse file tree 2 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -31,12 +31,12 @@ install(DIRECTORY ${SEVEN_BIT_DI_HEADERS_DIR}/ DESTINATION include)
3131export (
3232 TARGETS 7BitDI
3333 NAMESPACE 7BitDI::
34- FILE ${CMAKE_CURRENT_BINARY_DIR} /${config_targets_file } )
35- install (EXPORT 7BitDI DESTINATION ${export_dest_dir } NAMESPACE 7BitDI:: FILE ${config_targets_file } )
34+ FILE ${CMAKE_CURRENT_BINARY_DIR} /${CONFIG_TARGETS_FILE } )
35+ install (EXPORT 7BitDI DESTINATION ${EXPORT_DEST_DIR } NAMESPACE 7BitDI:: FILE ${CONFIG_TARGETS_FILE } )
3636
3737include (CMakePackageConfigHelpers)
38- configure_package_config_file(${project_config_in } ${project_config_out }
39- INSTALL_DESTINATION ${export_dest_dir } )
38+ configure_package_config_file(${PROJECT_CONFIG_IN } ${PROJECT_CONFIG_OUT }
39+ INSTALL_DESTINATION ${EXPORT_DEST_DIR } )
4040
41- write_basic_package_version_file(${version_config_file } COMPATIBILITY SameMajorVersion)
42- install (FILES ${project_config_out } ${version_config_file } DESTINATION ${export_dest_dir } )
41+ write_basic_package_version_file(${VERSIONS_CONFIG_FILE } COMPATIBILITY SameMajorVersion)
42+ install (FILES ${PROJECT_CONFIG_OUT } ${VERSIONS_CONFIG_FILE } DESTINATION ${EXPORT_DEST_DIR } )
Original file line number Diff line number Diff line change @@ -54,11 +54,12 @@ if(SEVEN_BIT_DI_BUILD_PIC)
5454 set (CMAKE_POSITION_INDEPENDENT_CODE ON )
5555endif ()
5656
57- set (project_config_in ${CMAKE_SOURCE_DIR} /Cmake/7bitDIConfig.cmake.in)
58- set (project_config_out ${CMAKE_BINARY_DIR} /7bitDIConfig.cmake)
59- set (config_targets_file 7bitDIConfigTargets.cmake)
60- set (version_config_file ${CMAKE_BINARY_DIR} /7bitDIConfigVersion.cmake)
61- set (export_dest_dir ${CMAKE_INSTALL_LIBDIR} /cmake/7bitDI)
57+ set (PROJECT_CONFIG_IN ${CMAKE_SOURCE_DIR} /Cmake/7bitDIConfig.cmake.in)
58+ set (PROJECT_CONFIG_OUT ${CMAKE_BINARY_DIR} /7bitDIConfig.cmake)
59+ set (CONFIG_TARGETS_FILE 7bitDIConfigTargets.cmake)
60+ set (VERSIONS_CONFIG_FILE ${CMAKE_BINARY_DIR} /7bitDIConfigVersion.cmake)
61+ set (EXPORT_DEST_DIR cmake/7bitDI)
62+
6263configure_file (${CMAKE_SOURCE_DIR} /Include /SevenBit/DI/Version .hpp.input ${CMAKE_SOURCE_DIR} /Include /SevenBit/DI/Version .hpp)
6364
6465set (INFOS
You can’t perform that action at this time.
0 commit comments