Skip to content

Commit 78673bc

Browse files
authored
Fix MSVC-2019 GitHub Actions CI (#192)
* Debug windows GA CI * Debug windows GA CI * Debug windows GA CI * Debug windows GA CI * Debug windows GA CI * Debug windows GA CI * Debug window GA CI build * Debug windows GA CI * Debug windows GA CI * Debug windows GA CI * Debug windows GA CI
1 parent 8db5c72 commit 78673bc

File tree

3 files changed

+21
-27
lines changed

3 files changed

+21
-27
lines changed

.github/workflows/windows-build.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
fail-fast: false
2020
max-parallel: 20
2121
matrix:
22-
compiler: [msvc-2019]
22+
compiler: [msvc-2019, msvc-2017]
2323
base-flags: ["", -DJINJA2CPP_CXX_STANDARD=17]
2424
build-config: [Release, Debug]
2525
build-platform: [x86, x64]
26-
build-runtime: [/MT]
27-
build-shared: [FALSE]
26+
build-runtime: ["", /MT, /MD]
27+
build-shared: [FALSE, TRUE]
2828

2929
include:
3030
- compiler: msvc-2017
@@ -66,13 +66,9 @@ jobs:
6666
VC_VARS: "${{ matrix.vc_vars }}"
6767
run: |
6868
call "%VC_VARS%"
69-
set BOOST_ROOT=%BOOST_ROOT_1_69_0%
70-
set path=%BOOST_ROOT%\lib;%PATH%
71-
echo "###########1 " %BOOST_ROOT%
72-
echo "###########2 " %PATH%
7369
mkdir -p .build
7470
cd .build
75-
cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON -DBOOST_ROOT=%BOOST_ROOT_1_69_0% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
71+
cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
7672
cmake --build . --config %INPUT_BUILD_CONFIG%
7773
7874
- name: Test
@@ -83,8 +79,5 @@ jobs:
8379
run: |
8480
cd .build
8581
call "%VC_VARS%"
86-
set BOOST_ROOT=%BOOST_ROOT_1_69_0%
8782
set path=%BOOST_ROOT%\lib;%PATH%
88-
echo "###########1 " %BOOST_ROOT%
89-
echo "###########2 " %PATH%
9083
ctest -C %INPUT_BUILD_CONFIG% -V

thirdparty/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if(MSVC)
1212
set (THIRDPARTY_RUNTIME_TYPE "/MD")
1313
endif()
1414
endif ()
15+
message(STATUS "Selected Jinja2C++ thirdparty libraries runtime type: '${THIRDPARTY_RUNTIME_TYPE}'")
1516
endif ()
1617

1718
function(update_submodule submodule)

thirdparty/external_boost_deps.cmake

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
if (JINJA2CPP_VERBOSE)
22
set (FIND_BOOST_PACKAGE_QUIET)
33
else ()
4-
set (FIND_BOOST_PACKAGE_QUIET)
4+
set (FIND_BOOST_PACKAGE_QUIET QUIET)
5+
endif ()
6+
7+
if (MSVC)
8+
if (NOT DEFINED Boost_USE_STATIC_LIBS)
9+
if (THIRDPARTY_RUNTIME_TYPE STREQUAL "/MD" OR THIRDPARTY_RUNTIME_TYPE STREQUAL "/MDd")
10+
set (Boost_USE_STATIC_LIBS OFF)
11+
set (Boost_USE_STATIC_RUNTIME OFF)
12+
else ()
13+
set (Boost_USE_STATIC_LIBS ON)
14+
set (Boost_USE_STATIC_RUNTIME ON)
15+
endif ()
16+
if (JINJA2CPP_VERBOSE)
17+
message (STATUS ">>>DEBUG<<< Boost_USE_STATIC_RUNTIME = ${Boost_USE_STATIC_RUNTIME}")
18+
endif ()
19+
endif ()
520
endif ()
621

722
find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET})
@@ -20,21 +35,6 @@ if(boost_filesystem_FOUND AND
2035

2136

2237
else()
23-
if (MSVC)
24-
if (NOT DEFINED Boost_USE_STATIC_LIBS)
25-
if (THIRDPARTY_RUNTIME_TYPE STREQUAL "/MD" OR THIRDPARTY_RUNTIME_TYPE STREQUAL "/MDd")
26-
set (Boost_USE_STATIC_LIBS OFF)
27-
set (Boost_USE_STATIC_RUNTIME OFF)
28-
else ()
29-
set (Boost_USE_STATIC_LIBS ON)
30-
set (Boost_USE_STATIC_RUNTIME ON)
31-
endif ()
32-
if (JINJA2CPP_VERBOSE)
33-
message (STATUS ">>>DEBUG<<< Boost_USE_STATIC_RUNTIME = ${Boost_USE_STATIC_RUNTIME}")
34-
endif ()
35-
endif ()
36-
endif ()
37-
3838
find_package(Boost COMPONENTS system filesystem ${FIND_BOOST_PACKAGE_QUIET} REQUIRED)
3939

4040
if (Boost_FOUND)

0 commit comments

Comments
 (0)