github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

cmake: fix install error 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-10-18 10:08:43 +08:00
parent 85366ba667
commit fe81fb80bd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -68,5 +68,6 @@ jobs:
run: | run: |
mkdir ci-test-build mkdir ci-test-build
cd ci-test-build cd ci-test-build
cmake -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DFRAMELESSHELPER_EXAMPLES_DEPLOYQT=OFF ${{ matrix.build_type_flag }} ${{ matrix.lib_type_flag }} .. cmake -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DCMAKE_INSTALL_PREFIX=../ci-test-install -DFRAMELESSHELPER_EXAMPLES_DEPLOYQT=OFF ${{ matrix.build_type_flag }} ${{ matrix.lib_type_flag }} ..
cmake --build . cmake --build .
cmake --install .

6
src/core/cmakehelper.cmake
View File

@ -118,9 +118,9 @@ function(setup_package_export arg_target arg_path arg_public arg_alias arg_priva
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${arg_target}Targets.cmake" FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${arg_target}Targets.cmake"
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::
) )
install(FILES "${arg_public}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${arg_path}") install(FILES ${arg_public} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${arg_path}")
install(FILES "${arg_alias}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${arg_path}") install(FILES ${arg_alias} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${arg_path}")
install(FILES "${arg_private}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${arg_path}/private") install(FILES ${arg_private} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${arg_path}/private")
install(EXPORT ${arg_target}Targets install(EXPORT ${arg_target}Targets
FILE ${arg_target}Targets.cmake FILE ${arg_target}Targets.cmake
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::