Skip to content

Commit 8edaea1

Browse files
authored
Merge: Windows CI output paths (#260)
* Make: Use ninja for windows deploy builds * Make: cmake set ARCHIVE_OUTPUT_DIRECTORY to binary dir
2 parents 8ff2ad7 + f1ec210 commit 8edaea1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ jobs:
683683
- name: Build library
684684
shell: cmd
685685
run: |
686-
cmake -DCMAKE_BUILD_TYPE=Release -B build_release -DSTRINGZILLA_BUILD_SHARED=1
686+
cmake -DCMAKE_BUILD_TYPE=Release -GNinja -B build_release -DSTRINGZILLA_BUILD_SHARED=1
687687
cmake --build build_release --config Release
688688
tar -cvf "stringzilla_bare_windows_${{ matrix.target }}_${{ steps.set_version.outputs.version }}.tar" "build_release\stringzilla_bare.dll" "build_release\stringzilla_bare.lib" ".\include\stringzilla\stringzilla.h"
689689

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,13 @@ function (set_compiler_flags target cpp_standard target_arch compiler_id)
180180

181181
# Set output directory for single-configuration generators (like Make)
182182
set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<0:>)
183+
set_target_properties(${target} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<0:>)
183184

184185
# Set output directory for multi-configuration generators (like Visual Studio)
185186
foreach (config IN LISTS CMAKE_CONFIGURATION_TYPES)
186187
string(TOUPPER ${config} config_upper)
187188
set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${config_upper} ${CMAKE_BINARY_DIR}/$<0:>)
189+
set_target_properties(${target} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${config_upper} ${CMAKE_BINARY_DIR}/$<0:>)
188190
endforeach ()
189191

190192
# Set the C++ standard

0 commit comments

Comments
 (0)