peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

standardized namespace, remove extra FILE option from export

Browse Source
This commit is contained in:
Alexander Kavon 2023-12-28 17:46:11 -05:00
parent dcc729b4d5
commit 48e3ecef04
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@ -518,7 +518,7 @@ set_target_properties(${target} PROPERTIES
# packaging # packaging
set(PACKAGE_NAME ${PROJECT_NAME}) set(PACKAGE_NAME ${PROJECT_NAME})
set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION}) set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
set(PACKAGE_NAMESPACE ${PROJECT_NAME}) set(PACKAGE_NAMESPACE ${PROJECT_NAME}::)
set(PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) set(PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
@ -535,8 +535,7 @@ install(TARGETS ${target} EXPORT ${PACKAGE_NAME}Targets
PUBLIC_HEADER DESTINATION ${QSK_INSTALL_HEADERS}) PUBLIC_HEADER DESTINATION ${QSK_INSTALL_HEADERS})
export(EXPORT ${PACKAGE_NAME}Targets export(EXPORT ${PACKAGE_NAME}Targets
FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PACKAGE_NAME}Targets.cmake NAMESPACE ${PACKAGE_NAMESPACE})
NAMESPACE ${PACKAGE_NAMESPACE}::)
configure_file(${QSK_CMAKE_DIR}/${PACKAGE_NAME}Config.cmake configure_file(${QSK_CMAKE_DIR}/${PACKAGE_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/cmake/${PACKAGE_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PACKAGE_NAME}Config.cmake
@ -546,15 +545,15 @@ install(EXPORT ${PACKAGE_NAME}Targets
FILE FILE
${PACKAGE_NAME}Targets.cmake ${PACKAGE_NAME}Targets.cmake
NAMESPACE NAMESPACE
${PACKAGE_NAMESPACE}:: ${PACKAGE_NAMESPACE}
DESTINATION DESTINATION
${PACKAGE_LOCATION}) ${PACKAGE_LOCATION})
install( install(
FILES FILES
${QSK_CMAKE_DIR}/${PACKAGE_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PACKAGE_NAME}Config.cmake
${QSK_CMAKE_DIR}/QskTools.cmake
${CMAKE_CURRENT_BINARY_DIR}/cmake/${PACKAGE_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PACKAGE_NAME}ConfigVersion.cmake
${QSK_CMAKE_DIR}/QskTools.cmake
DESTINATION DESTINATION
${PACKAGE_LOCATION} ${PACKAGE_LOCATION}
COMPONENT COMPONENT