Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

ci: try fix ci

This commit is contained in:
Yuhang Zhao 2023-06-30 17:31:01 +08:00
parent 2a49e9fcaf
commit fa5389a0fc
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake

@ -1 +1 @@
Subproject commit f41e3f888db144b5d30a3bd8d227905a391531f1
Subproject commit 69aa8ca8ed5ad4b06d0bc024293641b1a14884ff

11
src/core/CMakeLists.txt
View File

@ -177,6 +177,8 @@ set_target_properties(${SUB_MODULE} PROPERTIES
OUTPUT_NAME "${SUB_MODULE_FULL_NAME}"
)
set(__export_targets ${SUB_MODULE})
if(NOT FRAMELESSHELPER_NO_BUNDLE_RESOURCE)
if(QT_VERSION VERSION_GREATER_EQUAL "6.2")
qt_add_resources(${SUB_MODULE} framelesshelpercore
@ -188,14 +190,15 @@ if(NOT FRAMELESSHELPER_NO_BUNDLE_RESOURCE)
OUTPUT_TARGETS __qrc_targets
)
if(__qrc_targets)
foreach(__target ${__qrc_targets})
list(APPEND __export_targets ${__qrc_targets})
if(FRAMELESSHELPER_BUILD_STATIC)
foreach(__target ${__qrc_targets})
target_sources(${SUB_MODULE} PRIVATE
$<TARGET_OBJECTS:${__target}>
)
endif()
endforeach()
endif()
endif()
else()
target_sources(${SUB_MODULE} PRIVATE
framelesshelpercore.qrc
@ -309,10 +312,10 @@ endif()
setup_compile_params(TARGETS ${SUB_MODULE} ${__extra_flags})
if(NOT FRAMELESSHELPER_NO_INSTALL)
setup_package_export(
TARGET ${SUB_MODULE}
TARGETS ${__export_targets}
NAMESPACE ${PROJECT_NAME}
PACKAGE_NAME ${PROJECT_NAME}
INCLUDE_DIR ${SUB_MODULE}
COMPONENT ${SUB_MODULE}
PUBLIC_HEADERS ${PUBLIC_HEADERS}
ALIAS_HEADERS ${PUBLIC_HEADERS_ALIAS}
PRIVATE_HEADERS ${PRIVATE_HEADERS}

11
src/quick/CMakeLists.txt
View File

@ -123,6 +123,8 @@ set_target_properties(${SUB_MODULE} PROPERTIES
OUTPUT_NAME "${SUB_MODULE_FULL_NAME}"
)
set(__export_targets ${SUB_MODULE})
set(__import_base_dir "${PROJECT_BINARY_DIR}/imports")
if(DEFINED FRAMELESSHELPER_IMPORT_DIR)
set(__import_base_dir "${FRAMELESSHELPER_IMPORT_DIR}")
@ -147,19 +149,20 @@ if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
QtQuick.Controls.Basic/auto
)
if(__qml_targets)
foreach(__target ${__qml_targets})
list(APPEND __export_targets ${__qml_targets})
# We have some resources bundled into the library,
# however, for static builds, the object files will
# not be packed into our final static library file,
# and thus it causes linker errors for our users,
# so we need this hack here.
if(FRAMELESSHELPER_BUILD_STATIC)
foreach(__target ${__qml_targets})
target_sources(${SUB_MODULE} PRIVATE
$<TARGET_OBJECTS:${__target}>
)
endif()
endforeach()
endif()
endif()
if(NOT FRAMELESSHELPER_NO_INSTALL)
qt_query_qml_module(${SUB_MODULE}
URI module_uri
@ -292,10 +295,10 @@ endif()
setup_compile_params(TARGETS ${SUB_MODULE} ${__extra_flags})
if(NOT FRAMELESSHELPER_NO_INSTALL)
setup_package_export(
TARGET ${SUB_MODULE}
TARGETS ${__export_targets}
NAMESPACE ${PROJECT_NAME}
PACKAGE_NAME ${PROJECT_NAME}
INCLUDE_DIR ${SUB_MODULE}
COMPONENT ${SUB_MODULE}
PUBLIC_HEADERS ${PUBLIC_HEADERS}
ALIAS_HEADERS ${PUBLIC_HEADERS_ALIAS}
PRIVATE_HEADERS ${PRIVATE_HEADERS}

4
src/widgets/CMakeLists.txt
View File

@ -183,10 +183,10 @@ endif()
setup_compile_params(TARGETS ${SUB_MODULE} ${__extra_flags})
if(NOT FRAMELESSHELPER_NO_INSTALL)
setup_package_export(
TARGET ${SUB_MODULE}
TARGETS ${SUB_MODULE}
NAMESPACE ${PROJECT_NAME}
PACKAGE_NAME ${PROJECT_NAME}
INCLUDE_DIR ${SUB_MODULE}
COMPONENT ${SUB_MODULE}
PUBLIC_HEADERS ${PUBLIC_HEADERS}
ALIAS_HEADERS ${PUBLIC_HEADERS_ALIAS}
PRIVATE_HEADERS ${PRIVATE_HEADERS}