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

renamed exported targets and files

Browse Source
This commit is contained in:
Rick Vogel 2024-01-10 00:33:35 +01:00 committed by uwerat
parent 1c23ed97ef
commit 690a3c57a1
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -16,3 +16,5 @@ qskinny.pro.user
html html
tags tags
.vscode .vscode
.cache
compile_commands.json

12
CMakeLists.txt
View File

@ -93,7 +93,7 @@ qsk_setup_options()
include(GNUInstallDirs) include(GNUInstallDirs)
# loading helper macros # loading helper macros
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH ${QSK_CMAKE_DIR})
include("QskConfigMacros") include("QskConfigMacros")
include("QskFindMacros") include("QskFindMacros")
@ -110,21 +110,21 @@ include(CMakePackageConfigHelpers)
# write QSkinnyConfigVersion.cmake file for cmake import # write QSkinnyConfigVersion.cmake file for cmake import
write_basic_package_version_file( write_basic_package_version_file(
${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}ConfigVersion.cmake
VERSION ${PACKAGE_VERSION} VERSION ${PACKAGE_VERSION}
COMPATIBILITY AnyNewerVersion) COMPATIBILITY AnyNewerVersion)
# Copy QSkinnyConfig.cmake to build dir # Copy QSkinnyConfig.cmake to build dir
configure_file(${QSK_CMAKE_DIR}/${PACKAGE_NAME}Config.cmake configure_file(${QSK_CMAKE_DIR}/${PACKAGE_NAME}Config.cmake
${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake
COPYONLY) COPYONLY)
# install QSkinnyConfig.cmake and QSkinnyConfigVersion.cmake # install QSkinnyConfig.cmake and QSkinnyConfigVersion.cmake
# and QskTools.cmake file to lib/cmake/QSkinny directory # file to lib/cmake/QSkinny directory
install( install(
FILES FILES
${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake
${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}ConfigVersion.cmake
DESTINATION DESTINATION
${PACKAGE_LOCATION} ${PACKAGE_LOCATION}
COMPONENT COMPONENT

4
cmake/QSkinnyConfig.cmake
View File

@ -1,3 +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}/QSkinnyTools.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/QmlExportTargets.cmake" OPTIONAL) include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyQmlExportTargets.cmake" OPTIONAL)

0
cmake/QskTools.cmake → cmake/QSkinnyTools.cmake
View File

17
qmlexport/CMakeLists.txt
View File

@ -3,8 +3,18 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
############################################################################ ############################################################################
set(HEADERS QskQmlGlobal.h QskShortcutQml.h QskLayoutQml.h QskMainQml.h QskQml.h) set(HEADERS
set(SOURCES QskShortcutQml.cpp QskLayoutQml.cpp QskMainQml.cpp QskQml.cpp) QskQmlGlobal.h
QskShortcutQml.h
QskLayoutQml.h
QskMainQml.h
QskQml.h)
set(SOURCES
QskShortcutQml.cpp
QskLayoutQml.cpp
QskMainQml.cpp
QskQml.cpp)
set(target qskqmlexport) set(target qskqmlexport)
qsk_add_library(${target} SHARED ${SOURCES} ${HEADERS}) qsk_add_library(${target} SHARED ${SOURCES} ${HEADERS})
@ -22,7 +32,8 @@ if(BUILD_QSKDLL)
endif() endif()
# packaging # packaging
set(PACKAGE_NAME QmlExport) set(PACKAGE_NAME QSkinnyQmlExport)
set(QSKQE_INSTALL_HEADERS "${CMAKE_INSTALL_INCLUDEDIR}/${target}")
set_target_properties(${target} PROPERTIES FOLDER libs) set_target_properties(${target} PROPERTIES FOLDER libs)
set_target_properties(${target} PROPERTIES EXPORT_NAME ${PACKAGE_NAME}) set_target_properties(${target} PROPERTIES EXPORT_NAME ${PACKAGE_NAME})

2
tools/CMakeLists.txt
View File

@ -2,7 +2,7 @@ if(TARGET Qt::Svg)
add_subdirectory(svg2qvg) add_subdirectory(svg2qvg)
install( install(
FILES FILES
${QSK_CMAKE_DIR}/QskTools.cmake ${QSK_CMAKE_DIR}/QSkinnyTools.cmake
DESTINATION DESTINATION
${PACKAGE_LOCATION} ${PACKAGE_LOCATION}
COMPONENT COMPONENT