@@ -38,7 +38,7 @@ environment:
38
38
# Representative for C++14
39
39
- job_name : Visual Studio 2017, x64, C++14
40
40
appveyor_build_worker_image : Visual Studio 2017
41
- platform : x64
41
+ platformtarget : x64
42
42
SQLITE_ORM_CXX_STANDARD : " "
43
43
44
44
- job_name : clang, C++17
@@ -74,17 +74,17 @@ environment:
74
74
75
75
- job_name : Visual Studio 2022, x64, C++17
76
76
appveyor_build_worker_image : Visual Studio 2022
77
- platform : x64
77
+ platformtarget : x64
78
78
SQLITE_ORM_CXX_STANDARD : " -DSQLITE_ORM_ENABLE_CXX_17=ON"
79
79
80
80
- job_name : Visual Studio 2022, x64, C++20
81
81
appveyor_build_worker_image : Visual Studio 2022
82
- platform : x64
82
+ platformtarget : x64
83
83
SQLITE_ORM_CXX_STANDARD : " -DSQLITE_ORM_ENABLE_CXX_20=ON"
84
84
85
85
- job_name : Visual Studio 2022, x86, C++20
86
86
appveyor_build_worker_image : Visual Studio 2022
87
- platform : x86
87
+ platformtarget : x86
88
88
SQLITE_ORM_CXX_STANDARD : " -DSQLITE_ORM_ENABLE_CXX_20=ON"
89
89
90
90
matrix :
99
99
- appveyor_build_worker_image : Visual Studio 2022
100
100
init :
101
101
- |-
102
- echo %appveyor_build_worker_image% - %platform % - %configuration%
102
+ echo %appveyor_build_worker_image% - %platformtarget % - %configuration%
103
103
cmake --version
104
- if "%platform %"=="x64" (set architecture=-A x64)
105
- if "%platform %"=="x86" (set architecture=-A Win32)
104
+ if "%platformtarget %"=="x64" (set architecture=-A x64)
105
+ if "%platformtarget %"=="x86" (set architecture=-A Win32)
106
106
if "%appveyor_build_worker_image%"=="Visual Studio 2022" (set generator="Visual Studio 17 2022" %architecture%)
107
107
if "%appveyor_build_worker_image%"=="Visual Studio 2017" (set generator="Visual Studio 15 2017" %architecture%)
108
108
# using custom vcpkg triplets for building and linking dynamic dependent libraries
113
113
cd %APPVEYOR_BUILD_FOLDER%
114
114
C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
115
115
C:\Tools\vcpkg\vcpkg integrate install
116
- set VCPKG_DEFAULT_TRIPLET=%platform %-windows-%configuration%
116
+ set VCPKG_DEFAULT_TRIPLET=%platformtarget %-windows-%configuration%
117
117
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] --overlay-triplets=vcpkg/triplets
118
118
rem The Visual Studio 2017 build worker image comes with CMake 3.16 only, and sqlite_orm will build the Catch2 dependency from source
119
119
if not "%appveyor_build_worker_image%"=="Visual Studio 2017" (vcpkg install catch2)
135
135
- appveyor_build_worker_image : Ubuntu
136
136
init :
137
137
- |-
138
+ platformtarget=$(uname -m); case $platformtarget in x86_64) platformtarget=x64;; amd64) platformtarget=x64;; esac; export platformtarget
138
139
echo $appveyor_build_worker_image
139
140
$CXX --version
140
141
cmake --version
@@ -145,26 +146,27 @@ for:
145
146
git fetch origin tag 2024.04.26 && git checkout 2024.04.26
146
147
popd
147
148
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
148
- export VCPKG_DEFAULT_TRIPLET=$platform -linux-$configuration
149
+ export VCPKG_DEFAULT_TRIPLET=$platformtarget -linux-$CONFIGURATION
149
150
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
150
151
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
151
152
before_build :
152
153
- |-
153
154
mkdir compile
154
155
cd compile
155
- cmake $SQLITE_ORM_CXX_STANDARD $cmake_build_examples -DCMAKE_BUILD_TYPE=$configuration --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
156
+ cmake $SQLITE_ORM_CXX_STANDARD $cmake_build_examples -DCMAKE_BUILD_TYPE=$CONFIGURATION --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
156
157
# build examples, and run tests (ie make & make test)
157
158
build_script :
158
159
- |-
159
- cmake --build . --config $configuration $cmake_build_parallel
160
- ctest --verbose --output-on-failure --build-config $configuration
160
+ cmake --build . --config $CONFIGURATION $cmake_build_parallel
161
+ ctest --verbose --output-on-failure --build-config $CONFIGURATION
161
162
-
162
163
# macOS
163
164
matrix :
164
165
only :
165
166
- appveyor_build_worker_image : macOS
166
167
init :
167
168
- |-
169
+ platformtarget=$(uname -m); case $platformtarget in x86_64) platformtarget=x64;; amd64) platformtarget=x64;; esac; export platformtarget
168
170
echo $appveyor_build_worker_image
169
171
$CXX --version
170
172
cmake --version
@@ -173,16 +175,16 @@ for:
173
175
- |-
174
176
git clone --depth 1 --branch 2024.04.26 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
175
177
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
176
- export VCPKG_DEFAULT_TRIPLET=$platform -osx-$configuration
178
+ export VCPKG_DEFAULT_TRIPLET=$platformtarget -osx-$CONFIGURATION
177
179
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
178
180
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
179
181
before_build :
180
182
- |-
181
183
mkdir compile
182
184
cd compile
183
- cmake $SQLITE_ORM_CXX_STANDARD -DCMAKE_BUILD_TYPE=$configuration --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
185
+ cmake $SQLITE_ORM_CXX_STANDARD -DCMAKE_BUILD_TYPE=$CONFIGURATION --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
184
186
# build examples, and run tests (ie make & make test)
185
187
build_script :
186
188
- |-
187
- cmake --build . --config $configuration --parallel
188
- ctest --verbose --output-on-failure --build-config $configuration
189
+ cmake --build . --config $CONFIGURATION --parallel
190
+ ctest --verbose --output-on-failure --build-config $CONFIGURATION
0 commit comments