Skip to content

Commit d939493

Browse files
committed
appveyor: Be explicit about the build configuration
1 parent d625a94 commit d939493

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

appveyor.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ for:
113113
cd %APPVEYOR_BUILD_FOLDER%
114114
C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
115115
C:\Tools\vcpkg\vcpkg integrate install
116-
set VCPKG_DEFAULT_TRIPLET=%platform%-windows
116+
set VCPKG_DEFAULT_TRIPLET=%platform%-windows-%configuration%
117117
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] --overlay-triplets=vcpkg/triplets
118118
rem The Visual Studio 2017 build worker image comes with CMake 3.16 only, and sqlite_orm will build the Catch2 dependency from source
119119
if not "%appveyor_build_worker_image%"=="Visual Studio 2017" (vcpkg install catch2)
120120
before_build:
121121
- |-
122122
mkdir compile
123123
cd compile
124-
cmake %SQLITE_ORM_CXX_STANDARD% -G %generator% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
124+
cmake %SQLITE_ORM_CXX_STANDARD% -G %generator% -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
125125
# build examples, and run tests (ie make & make test)
126126
build_script:
127127
- |-
@@ -145,18 +145,19 @@ for:
145145
git fetch origin tag 2024.04.26 && git checkout 2024.04.26
146146
popd
147147
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
148+
set VCPKG_DEFAULT_TRIPLET=$platform-linux-$configuration
148149
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
149150
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
150151
before_build:
151152
- |-
152153
mkdir compile
153154
cd compile
154-
cmake $SQLITE_ORM_CXX_STANDARD $cmake_build_examples --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
155+
cmake $SQLITE_ORM_CXX_STANDARD $cmake_build_examples -DCMAKE_BUILD_TYPE=$configuration --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
155156
# build examples, and run tests (ie make & make test)
156157
build_script:
157158
- |-
158-
cmake --build . $cmake_build_parallel
159-
ctest --verbose --output-on-failure
159+
cmake --build . --config $configuration $cmake_build_parallel
160+
ctest --verbose --output-on-failure --build-config $configuration
160161
-
161162
# macOS
162163
matrix:
@@ -172,15 +173,16 @@ for:
172173
- |-
173174
git clone --depth 1 --branch 2024.04.26 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
174175
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
176+
set VCPKG_DEFAULT_TRIPLET=$platform-osx-$configuration
175177
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
176178
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
177179
before_build:
178180
- |-
179181
mkdir compile
180182
cd compile
181-
cmake $SQLITE_ORM_CXX_STANDARD --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
183+
cmake $SQLITE_ORM_CXX_STANDARD -DCMAKE_BUILD_TYPE=$configuration --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
182184
# build examples, and run tests (ie make & make test)
183185
build_script:
184186
- |-
185-
cmake --build . --parallel
186-
ctest --verbose --output-on-failure
187+
cmake --build . --config $configuration --parallel
188+
ctest --verbose --output-on-failure --build-config $configuration

vcpkg/triplets/x64-linux.cmake renamed to vcpkg/triplets/x64-linux-Release.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
set(VCPKG_TARGET_ARCHITECTURE x64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE dynamic)
6-
7-
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
86
set(VCPKG_BUILD_TYPE release)
97

8+
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
109
set(VCPKG_FIXUP_ELF_RPATH ON)

vcpkg/triplets/x64-osx.cmake renamed to vcpkg/triplets/x64-osx-Release.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set(VCPKG_TARGET_ARCHITECTURE x64)
44
set(VCPKG_CRT_LINKAGE dynamic)
55
set(VCPKG_LIBRARY_LINKAGE dynamic)
6+
set(VCPKG_BUILD_TYPE release)
67

78
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
89
set(VCPKG_OSX_ARCHITECTURES x86_64)
9-
set(VCPKG_BUILD_TYPE release)

0 commit comments

Comments
 (0)