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

updated project paths to namespace qskinny, project namespace should be project name, reused qsk_install_* variables

Browse Source
This commit is contained in:
Alexander Kavon 2023-12-21 18:26:14 -05:00
parent ffe2394d0b
commit fc72a95aaf
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -62,8 +62,9 @@ macro(qsk_setup_build)
endmacro() endmacro()
macro(qsk_setup_install) macro(qsk_setup_install)
set(QSK_INSTALL_HEADERS include) string(TOLOWER "${PROJECT_NAME}" PACKAGE_DIR)
set(QSK_INSTALL_LIBS lib) set(QSK_INSTALL_HEADERS "${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_DIR}")
set(QSK_INSTALL_LIBS "${CMAKE_INSTALL_LIBDIR}/${PACKAGE_DIR}")
endmacro() endmacro()
############################################################################ ############################################################################
@ -122,8 +123,8 @@ endif()
# 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 Qsk) set(PACKAGE_NAMESPACE ${PROJECT_NAME})
set(PACKAGE_LOCATION ${QSK_INSTALL_LIBS}/cmake/${PROJECT_NAME}) set(PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
install(TARGETS qskinny EXPORT ${PACKAGE_NAME}Targets install(TARGETS qskinny EXPORT ${PACKAGE_NAME}Targets
LIBRARY DESTINATION ${QSK_INSTALL_LIBS} LIBRARY DESTINATION ${QSK_INSTALL_LIBS}
@ -140,7 +141,7 @@ write_basic_package_version_file(
export(EXPORT ${PACKAGE_NAME}Targets export(EXPORT ${PACKAGE_NAME}Targets
FILE ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}Targets.cmake FILE ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}Targets.cmake
NAMESPACE ${PACKAGE_NAMESPACE}::) NAMESPACE "${PACKAGE_NAMESPACE}::")
configure_file(cmake/${PACKAGE_NAME}Config.cmake configure_file(cmake/${PACKAGE_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}Config.cmake
@ -150,7 +151,7 @@ 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})
@ -162,4 +163,4 @@ install(
DESTINATION DESTINATION
${PACKAGE_LOCATION} ${PACKAGE_LOCATION}
COMPONENT COMPONENT
Devel) Devel)

2
cmake/QskBuildFunctions.cmake
View File

@ -65,7 +65,7 @@ function(qsk_add_plugin target TYPE CLASS_NAME)
set_target_properties( ${target} PROPERTIES set_target_properties( ${target} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/${TYPE}) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/${TYPE})
install(TARGETS ${target} DESTINATION "${CMAKE_INSTALL_LIBDIR}/qskinny/plugins/${TYPE}" ) install(TARGETS ${target} DESTINATION "${QSK_INSTALL_LIBS}/plugins/${TYPE}" )
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
INSTALL_RPATH "\${ORIGIN}/../../lib" ) INSTALL_RPATH "\${ORIGIN}/../../lib" )

6
src/CMakeLists.txt
View File

@ -511,11 +511,9 @@ set_target_properties(${target}
list(TRANSFORM HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/") list(TRANSFORM HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/")
set_target_properties(${target} PROPERTIES PUBLIC_HEADER "${HEADERS}") set_target_properties(${target} PROPERTIES PUBLIC_HEADER "${HEADERS}")
set_target_properties(${target} PROPERTIES EXPORT_NAME ${PROJECT_NAME})
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
# Set the library destination to ensure an organized library + plugins dir # Set the library destination to ensure an organized library + plugins dir
install(TARGETS ${target} install(TARGETS ${target})
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${target}
)