File tree 3 files changed +15
-5
lines changed
3 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -93,10 +93,9 @@ if [[ "-$BUILD_TYPE-" == *-static-* ]]; then
93
93
export LDFLAGS=" -L/opt/static-libs/$COMPILER /lib"
94
94
CMAKE_ARGS=" ${CMAKE_ARGS} -DSTATIC_BUILD_DO_NOT_USE=1"
95
95
CMAKE_ARGS=" ${CMAKE_ARGS} -DSTATIC_BUILD_EXTRA_PREFIX=/opt/static-libs/$COMPILER "
96
- else
97
- CMAKE_ARGS=" ${CMAKE_ARGS} -DWITH_BENCHMARKS=1"
98
96
fi
99
97
98
+ CMAKE_ARGS=" ${CMAKE_ARGS} -DWITH_BENCHMARKS=1"
100
99
CMAKE_ARGS=" ${CMAKE_ARGS} -DWITH_TESTS=1 -DWITH_LEGACY_FUSE=1"
101
100
CMAKE_ARGS=" ${CMAKE_ARGS} -DDWARFS_ARTIFACTS_DIR=/artifacts"
102
101
Original file line number Diff line number Diff line change 40
40
- name : Configure Build
41
41
shell : cmd
42
42
run : |
43
- cmake -B${{ runner.temp }}\build -S${{ runner.workspace }}\dwarfs -GNinja -DCMAKE_MAKE_PROGRAM=C:\bin\ninja.exe -DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} -DWITH_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}\vcpkg-install-dwarfs -DDWARFS_ARTIFACTS_DIR=Z:\artifacts\dwarfs
43
+ cmake -B${{ runner.temp }}\build -S${{ runner.workspace }}\dwarfs -GNinja -DCMAKE_MAKE_PROGRAM=C:\bin\ninja.exe -DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} -DWITH_TESTS=ON -DWITH_BENCHMARKS=ON - DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}\vcpkg-install-dwarfs -DDWARFS_ARTIFACTS_DIR=Z:\artifacts\dwarfs
44
44
45
45
- name : Run Build
46
46
shell : cmd
@@ -120,7 +120,7 @@ jobs:
120
120
- name : Configure Rice++ Build
121
121
shell : cmd
122
122
run : |
123
- cmake -B${{ runner.temp }}\build-ricepp -S${{ runner.workspace }}\dwarfs\ricepp -GNinja -DCMAKE_MAKE_PROGRAM=C:\bin\ninja.exe -DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} -DWITH_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}\vcpkg-install-dwarfs -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
123
+ cmake -B${{ runner.temp }}\build-ricepp -S${{ runner.workspace }}\dwarfs\ricepp -GNinja -DCMAKE_MAKE_PROGRAM=C:\bin\ninja.exe -DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} -DWITH_TESTS=ON -DWITH_BENCHMARKS=ON - DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}\vcpkg-install-dwarfs -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
124
124
125
125
- name : Run Build
126
126
shell : cmd
@@ -140,7 +140,7 @@ jobs:
140
140
- name : Configure Build
141
141
shell : cmd
142
142
run : |
143
- cmake -B${{ runner.temp }}\build -S${{ runner.workspace }}\dwarfs -GNinja -DCMAKE_MAKE_PROGRAM=C:\bin\ninja.exe -DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} -DWITH_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}\vcpkg-install-dwarfs -DDWARFS_ARTIFACTS_DIR=Z:\artifacts\dwarfs -DCMAKE_PREFIX_PATH=${{ runner.temp }}\ricepp-install -DUSE_RICEPP_PACKAGE=ON
143
+ cmake -B${{ runner.temp }}\build -S${{ runner.workspace }}\dwarfs -GNinja -DCMAKE_MAKE_PROGRAM=C:\bin\ninja.exe -DCMAKE_BUILD_TYPE=${{ matrix.build_mode }} -DWITH_TESTS=ON -DWITH_BENCHMARKS=ON - DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}\vcpkg-install-dwarfs -DDWARFS_ARTIFACTS_DIR=Z:\artifacts\dwarfs -DCMAKE_PREFIX_PATH=${{ runner.temp }}\ricepp-install -DUSE_RICEPP_PACKAGE=ON
144
144
145
145
- name : Run Build
146
146
shell : cmd
Original file line number Diff line number Diff line change @@ -1237,10 +1237,21 @@ if(STATIC_BUILD_DO_NOT_USE OR WIN32)
1237
1237
"binary_tarball=${CMAKE_PROJECT_NAME} -${DWARFS_ARTIFACT_ID}${PACKAGE_EXT} \n "
1238
1238
"universal_binary=${UNIVERSAL_PACKED} \n " )
1239
1239
1240
+ if (USE_RICEPP_PACKAGE)
1241
+ add_executable (ricepp_benchmark_fits ricepp/ricepp_benchmark_fits.cpp)
1242
+ target_link_libraries (ricepp_benchmark_fits ricepp benchmark::benchmark)
1243
+ set (RICEPP_BENCHMARK_FITS "ricepp_benchmark_fits" )
1244
+ else ()
1245
+ set (RICEPP_BENCHMARK_FITS "ricepp/ricepp_benchmark_fits" )
1246
+ endif ()
1247
+
1240
1248
add_custom_target (copy_artifacts
1241
1249
COMMAND ${CMAKE_COMMAND} -E make_directory ${ARTIFACTS_FULL_PATH}
1242
1250
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR} /${CMAKE_PROJECT_NAME} -${DWARFS_ARTIFACT_ID}${PACKAGE_EXT} ${ARTIFACTS_FULL_PATH}
1243
1251
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR} /${UNIVERSAL_PACKED} ${ARTIFACTS_FULL_PATH}
1252
+ COMMAND ${CMAKE_COMMAND} -E copy
1253
+ ${CMAKE_CURRENT_BINARY_DIR} /${RICEPP_BENCHMARK_FITS}${CMAKE_EXECUTABLE_SUFFIX}
1254
+ ${ARTIFACTS_FULL_PATH} /ricepp_benchmark_fits-${DWARFS_ARTIFACT_ID}${CMAKE_EXECUTABLE_SUFFIX}
1244
1255
)
1245
1256
1246
1257
add_custom_target (copy_source_artifacts
You can’t perform that action at this time.
0 commit comments