From fe81fb80bdc295bc9ae75936624ef8b73dd26da6 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Tue, 18 Oct 2022 10:08:43 +0800 Subject: [PATCH] cmake: fix install error Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- .github/workflows/ci.yml | 3 ++- src/core/cmakehelper.cmake | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c138d33..4d9427d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,5 +68,6 @@ jobs: run: | mkdir 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 --install . diff --git a/src/core/cmakehelper.cmake b/src/core/cmakehelper.cmake index 57a27e2..d2b519e 100644 --- a/src/core/cmakehelper.cmake +++ b/src/core/cmakehelper.cmake @@ -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" NAMESPACE ${PROJECT_NAME}:: ) - install(FILES "${arg_public}" 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_public} 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(EXPORT ${arg_target}Targets FILE ${arg_target}Targets.cmake NAMESPACE ${PROJECT_NAME}::