File tree 3 files changed +21
-27
lines changed
3 files changed +21
-27
lines changed Original file line number Diff line number Diff line change @@ -19,12 +19,12 @@ jobs:
19
19
fail-fast : false
20
20
max-parallel : 20
21
21
matrix :
22
- compiler : [msvc-2019]
22
+ compiler : [msvc-2019, msvc-2017 ]
23
23
base-flags : ["", -DJINJA2CPP_CXX_STANDARD=17]
24
24
build-config : [Release, Debug]
25
25
build-platform : [x86, x64]
26
- build-runtime : [/MT]
27
- build-shared : [FALSE]
26
+ build-runtime : ["", /MT, /MD ]
27
+ build-shared : [FALSE, TRUE ]
28
28
29
29
include :
30
30
- compiler : msvc-2017
66
66
VC_VARS : " ${{ matrix.vc_vars }}"
67
67
run : |
68
68
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%
73
69
mkdir -p .build
74
70
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%
76
72
cmake --build . --config %INPUT_BUILD_CONFIG%
77
73
78
74
- name : Test
83
79
run : |
84
80
cd .build
85
81
call "%VC_VARS%"
86
- set BOOST_ROOT=%BOOST_ROOT_1_69_0%
87
82
set path=%BOOST_ROOT%\lib;%PATH%
88
- echo "###########1 " %BOOST_ROOT%
89
- echo "###########2 " %PATH%
90
83
ctest -C %INPUT_BUILD_CONFIG% -V
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ if(MSVC)
12
12
set (THIRDPARTY_RUNTIME_TYPE "/MD" )
13
13
endif ()
14
14
endif ()
15
+ message (STATUS "Selected Jinja2C++ thirdparty libraries runtime type: '${THIRDPARTY_RUNTIME_TYPE} '" )
15
16
endif ()
16
17
17
18
function (update_submodule submodule)
Original file line number Diff line number Diff line change 1
1
if (JINJA2CPP_VERBOSE)
2
2
set (FIND_BOOST_PACKAGE_QUIET)
3
3
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 ()
5
20
endif ()
6
21
7
22
find_package (boost_filesystem ${FIND_BOOST_PACKAGE_QUIET} )
@@ -20,21 +35,6 @@ if(boost_filesystem_FOUND AND
20
35
21
36
22
37
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
-
38
38
find_package (Boost COMPONENTS system filesystem ${FIND_BOOST_PACKAGE_QUIET} REQUIRED)
39
39
40
40
if (Boost_FOUND)
You can’t perform that action at this time.
0 commit comments