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

move QskTools.cmake to optional install directive, remove qsk_update_package_config_file for optional cmake keyword

Browse Source
This commit is contained in:
Alexander Kavon 2024-01-10 05:38:12 -05:00 committed by uwerat
parent 17809eaea5
commit 92e08edda7
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -125,7 +125,6 @@ install(
FILES FILES
${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake
${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake
${QSK_CMAKE_DIR}/QskTools.cmake
DESTINATION DESTINATION
${PACKAGE_LOCATION} ${PACKAGE_LOCATION}
COMPONENT COMPONENT

2
cmake/QSkinnyConfig.cmake
View File

@ -1 +1,3 @@
include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/QskTools.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/QmlExportTargets.cmake" OPTIONAL)

8
cmake/QskBuildFunctions.cmake
View File

@ -115,11 +115,3 @@ function(qsk_add_shaders target)
PREFIX "/qskinny/shaders" ${ARGV} OUTPUTS ${outfiles} ) PREFIX "/qskinny/shaders" ${ARGV} OUTPUTS ${outfiles} )
endfunction() endfunction()
function(qsk_update_package_config_file target)
file(APPEND
${CMAKE_BINARY_DIR}/_QSkinny/QSkinnyConfig.cmake
"include(\"\${CMAKE_CURRENT_LIST_DIR}/${target}.cmake\")\n")
endfunction()

2
qmlexport/CMakeLists.txt
View File

@ -42,5 +42,3 @@ install(EXPORT ${PACKAGE_NAME}Targets
${PACKAGE_NAMESPACE} ${PACKAGE_NAMESPACE}
DESTINATION DESTINATION
${PACKAGE_LOCATION}) ${PACKAGE_LOCATION})
qsk_update_package_config_file(${PACKAGE_NAME}Targets)

8
tools/CMakeLists.txt
View File

@ -1,4 +1,10 @@
if(TARGET Qt::Svg) if(TARGET Qt::Svg)
add_subdirectory(svg2qvg) add_subdirectory(svg2qvg)
qsk_update_package_config_file(QskTools) install(
FILES
${QSK_CMAKE_DIR}/QskTools.cmake
DESTINATION
${PACKAGE_LOCATION}
COMPONENT
Devel)
endif() endif()