File tree 2 files changed +12
-6
lines changed
2 files changed +12
-6
lines changed Original file line number Diff line number Diff line change 89
89
compiler : [5.0, 6.0, 7, 8]
90
90
base-flags : ["", -DJINJA2CPP_CXX_STANDARD=17]
91
91
build-config : [Release, Debug]
92
-
92
+ build-shared : [TRUE, FALSE]
93
+
93
94
include :
94
95
- compiler : 5.0
95
96
docker-image : conanio/clang50
@@ -114,6 +115,7 @@ jobs:
114
115
INPUT_BASE_FLAGS : ${{ matrix.base-flags }}
115
116
INPUT_BASE_CONFIG : ${{ matrix.build-config }}
116
117
INPUT_EXTRA_FLAGS : ${{ matrix.extra-flags }}
118
+ INPUT_BUILD_SHARED : ${{ matrix.build-shared }}
117
119
HOME : /home/conan
118
120
run : |
119
121
export BUILD_TARGET=all
@@ -124,7 +126,7 @@ jobs:
124
126
export EXTRA_FLAGS="${INPUT_BASE_FLAGS} ${INPUT_EXTRA_FLAGS}"
125
127
mkdir $BUILD_DIRECTORY && cd $BUILD_DIRECTORY
126
128
sudo chmod gou+rw -R $WORKSPACE
127
- cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal $EXTRA_FLAGS $WORKSPACE && cmake --build . --config $BUILD_CONFIG --target all -- -j4
129
+ cmake $CMAKE_OPTS -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS -DJINJA2CPP_DEPS_MODE=internal -DJINJA2CPP_BUILD_SHARED=$INPUT_BUILD_SHARED $EXTRA_FLAGS $WORKSPACE && cmake --build . --config $BUILD_CONFIG --target all -- -j4
128
130
129
131
- name : Test
130
132
run : |
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ endif()
15
15
set (JINJA2CPP_SANITIZERS address+undefined memory)
16
16
set (JINJA2CPP_WITH_SANITIZERS none CACHE STRING "Build with sanitizer" )
17
17
set_property (CACHE JINJA2CPP_WITH_SANITIZERS PROPERTY STRINGS ${JINJA2CPP_SANITIZERS} )
18
- set (JINJA2CPP_DEPS_MODE "external" CACHE STRING "Jinja2Cpp dependency management mode (internal | external | external-boost | conan-build). See documentation for details. 'interal' is default." )
18
+ set (JINJA2CPP_DEPS_MODE "external" CACHE STRING "Jinja2Cpp dependency management mode (internal | external | external-boost | conan-build). See documentation for details. 'interal' is default." )
19
19
option (JINJA2CPP_BUILD_TESTS "Build Jinja2Cpp unit tests" ${JINJA2CPP_IS_MAIN_PROJECT} )
20
20
option (JINJA2CPP_STRICT_WARNINGS "Enable additional warnings and treat them as errors" ON )
21
21
option (JINJA2CPP_BUILD_SHARED "Build shared linkage version of Jinja2Cpp" OFF )
@@ -25,13 +25,17 @@ if (DEFINED BUILD_SHARED_LIBS)
25
25
set (JINJA2CPP_BUILD_SHARED BUILD_SHARED_LIBS )
26
26
endif ()
27
27
28
+ if (JINJA2CPP_BUILD_SHARED)
29
+ set (JINJA2CPP_PIC ON )
30
+ endif ()
31
+
28
32
if (NOT JINJA2CPP_DEPS_MODE)
29
- set (JINJA2CPP_DEPS_MODE "internal" )
33
+ set (JINJA2CPP_DEPS_MODE "internal" )
30
34
endif ()
31
35
32
36
if (JINJA2CPP_IS_MAIN_PROJECT OR NOT CMAKE_CXX_STANDARD)
33
- set (JINJA2CPP_CXX_STANDARD 14 CACHE STRING "Jinja2Cpp C++ standard to build with. C++14 is default" )
34
- set (CMAKE_CXX_STANDARD ${JINJA2CPP_CXX_STANDARD} )
37
+ set (JINJA2CPP_CXX_STANDARD 14 CACHE STRING "Jinja2Cpp C++ standard to build with. C++14 is default" )
38
+ set (CMAKE_CXX_STANDARD ${JINJA2CPP_CXX_STANDARD} )
35
39
endif ()
36
40
37
41
if (NOT JINJA2CPP_CXX_STANDARD)
You can’t perform that action at this time.
0 commit comments