Skip to content

Commit b83ed17

Browse files
committed
fix cpack bug
1 parent 13790cf commit b83ed17

2 files changed

Lines changed: 19 additions & 10 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ jobs:
117117
cmake -B build \
118118
-G Ninja \
119119
-DCMAKE_BUILD_TYPE=Release \
120+
-DBUILD_RELEASE_LITE=ON \
120121
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
121122
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
122-
-DBUILD_RELEASE_LITE=OFF \
123123
-DVCPKG_MANIFEST_FEATURES="$VCPKG_FEATURES" \
124124
-DOpenMP_CXX_FLAGS="-fopenmp" \
125125
-DOpenMP_C_FLAGS="-fopenmp" \
@@ -167,7 +167,9 @@ jobs:
167167
uses: actions/upload-artifact@v4
168168
with:
169169
name: packages-linux-x64
170-
path: build/bin/packages/*
170+
path: |
171+
build/bin/packages/*.deb
172+
build/bin/packages/*.tar.gz
171173
if-no-files-found: error
172174

173175

@@ -298,6 +300,7 @@ jobs:
298300
cmake -B build \
299301
-G Ninja \
300302
-DCMAKE_BUILD_TYPE=Release \
303+
-DBUILD_RELEASE_LITE=ON \
301304
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
302305
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
303306
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
@@ -315,7 +318,6 @@ jobs:
315318
-DOpenMP_CXX_LIB_NAMES="omp" \
316319
-DOpenMP_omp_LIBRARY="$BREW_PREFIX/opt/libomp/lib/libomp.dylib" \
317320
-DVCPKG_TARGET_TRIPLET=arm64-osx-relaxed \
318-
-DBUILD_RELEASE_LITE=OFF \
319321
-DVCPKG_OVERLAY_TRIPLETS="${{ github.workspace }}/tools/vcpkg/triplets/community" \
320322
-DVCPKG_MANIFEST_FEATURES="$VCPKG_FEATURES" \
321323
-DVCPKG_FEATURE_FLAGS="versions,manifests,registries"
@@ -361,7 +363,7 @@ jobs:
361363
uses: actions/upload-artifact@v4
362364
with:
363365
name: packages-macos-arm64
364-
path: build/bin/packages/*
366+
path: build/bin/packages/*.dmg
365367
if-no-files-found: error
366368

367369

@@ -459,9 +461,9 @@ jobs:
459461
-G "Visual Studio 17 2022" `
460462
-A x64 `
461463
-DCMAKE_BUILD_TYPE=Release `
464+
-DBUILD_RELEASE_LITE=ON `
462465
-DCMAKE_TOOLCHAIN_FILE="$toolchainFile" `
463466
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
464-
-DBUILD_RELEASE_LITE=OFF `
465467
-DVCPKG_MANIFEST_FEATURES="$VCPKG_FEATURES"
466468
467469
- name: Build
@@ -506,7 +508,7 @@ jobs:
506508
uses: actions/upload-artifact@v4
507509
with:
508510
name: packages-windows-x64
509-
path: build/bin/packages/*
511+
path: build/bin/packages/*.exe
510512
if-no-files-found: error
511513

512514

CMakeLists.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,14 @@ elseif(WIN32)
581581
set(CPACK_NSIS_INSTALL_ROOT "C:")
582582
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-setup")
583583
endif()
584-
584+
585+
file(MAKE_DIRECTORY "${ABS_SOURCE_DIR}/configs")
586+
file(MAKE_DIRECTORY "${ABS_SOURCE_DIR}/models")
587+
file(MAKE_DIRECTORY "${ABS_SOURCE_DIR}/plugins")
588+
file(MAKE_DIRECTORY "${ABS_SOURCE_DIR}/log")
589+
590+
file(TO_NATIVE_PATH "${ABS_SOURCE_DIR}" ABS_SOURCE_DIR_WIN)
591+
585592
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
586593
set(CPACK_COMPONENTS_ALL Applications)
587594
set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};${CMAKE_PROJECT_NAME};ALL;/")
@@ -631,13 +638,13 @@ elseif(WIN32)
631638

632639
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
633640
IfFileExists '$INSTDIR\\\\configs' +2
634-
File /r '${ABS_SOURCE_DIR}\\\\configs'
641+
File /r '${ABS_SOURCE_DIR_WIN}\\\\configs'
635642
636643
IfFileExists '$INSTDIR\\\\models' +2
637-
File /r '${ABS_SOURCE_DIR}\\\\models'
644+
File /r '${ABS_SOURCE_DIR_WIN}\\\\models'
638645
639646
IfFileExists '$INSTDIR\\\\plugins' +2
640-
File /r '${ABS_SOURCE_DIR}\\\\plugins'
647+
File /r '${ABS_SOURCE_DIR_WIN}\\\\plugins'
641648
642649
IfFileExists '$INSTDIR\\\\log' +2
643650
CreateDirectory '$INSTDIR\\\\log'

0 commit comments

Comments
 (0)