diff options
author | Brent Cook <busterb@gmail.com> | 2020-05-01 08:31:11 -0500 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2020-05-01 08:31:11 -0500 |
commit | 012014df35b7ff951363b4127c0bcaf9ad555bfe (patch) | |
tree | 3435b5a1f7b2f73920ea54d2cab0b3145269ea8f | |
parent | ee9d53e2714cf6671dc6abf8bdc7654a13981bd5 (diff) | |
download | portable-012014df35b7ff951363b4127c0bcaf9ad555bfe.tar.gz portable-012014df35b7ff951363b4127c0bcaf9ad555bfe.tar.bz2 portable-012014df35b7ff951363b4127c0bcaf9ad555bfe.zip |
more MSVC build/test tweaks
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | appveyor.yml | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d2fba..515b3fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -1,5 +1,6 @@ | |||
1 | if(MSVC) | 1 | if(MSVC) |
2 | cmake_minimum_required (VERSION 3.16.4) | 2 | cmake_minimum_required (VERSION 3.16.4) |
3 | cmake_policy(SET CMP0091 NEW) | ||
3 | else() | 4 | else() |
4 | cmake_minimum_required (VERSION 3.0) | 5 | cmake_minimum_required (VERSION 3.0) |
5 | endif() | 6 | endif() |
@@ -13,7 +14,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) | |||
13 | include(cmake_export_symbol) | 14 | include(cmake_export_symbol) |
14 | include(GNUInstallDirs) | 15 | include(GNUInstallDirs) |
15 | 16 | ||
16 | cmake_policy(SET CMP0091 NEW) | ||
17 | project (LibreSSL C ASM) | 17 | project (LibreSSL C ASM) |
18 | 18 | ||
19 | enable_testing() | 19 | enable_testing() |
diff --git a/appveyor.yml b/appveyor.yml index b29c39d..4e0b488 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -7,12 +7,22 @@ environment: | |||
7 | matrix: | 7 | matrix: |
8 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | 8 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
9 | GENERATOR: Visual Studio 16 2019 | 9 | GENERATOR: Visual Studio 16 2019 |
10 | ARCHITECTURE: Win64 | 10 | ARCHITECTURE: Win32 |
11 | CONFIG: Release | 11 | CONFIG: Release |
12 | SHARED_LIBS: ON | 12 | SHARED_LIBS: ON |
13 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | 13 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
14 | GENERATOR: Visual Studio 16 2019 | 14 | GENERATOR: Visual Studio 16 2019 |
15 | ARCHITECTURE: Win64 | 15 | ARCHITECTURE: Win32 |
16 | CONFIG: Release | ||
17 | SHARED_LIBS: OFF | ||
18 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||
19 | GENERATOR: Visual Studio 16 2019 | ||
20 | ARCHITECTURE: x64 | ||
21 | CONFIG: Release | ||
22 | SHARED_LIBS: ON | ||
23 | - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 | ||
24 | GENERATOR: Visual Studio 16 2019 | ||
25 | ARCHITECTURE: x64 | ||
16 | CONFIG: Release | 26 | CONFIG: Release |
17 | SHARED_LIBS: OFF | 27 | SHARED_LIBS: OFF |
18 | 28 | ||