File tree 3 files changed +12
-9
lines changed
3 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -143,6 +143,7 @@ jobs:
143
143
mkdir $BUILD_DIRECTORY && cd $BUILD_DIRECTORY
144
144
sudo chmod gou+rw -R $WORKSPACE
145
145
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
146
+ shell : bash
146
147
147
148
- name : Test
148
149
env :
Original file line number Diff line number Diff line change @@ -219,14 +219,15 @@ set_target_properties(${LIB_TARGET_NAME} PROPERTIES
219
219
220
220
set_property (TARGET ${LIB_TARGET_NAME} PROPERTY PUBLIC_HEADER ${PublicHeaders} ${JINJA2CPP_EXTRA_PUBLIC_HEADERS} )
221
221
222
- configure_file (jinja2cpp.pc.in jinja2cpp.pc @ONLY)
222
+ configure_file (jinja2cpp.pc.in ${CMAKE_BINARY_DIR} / jinja2cpp.pc @ONLY)
223
223
224
224
if (JINJA2CPP_BUILD_TESTS)
225
225
enable_testing ()
226
226
227
227
CollectSources(TestSources TestHeaders ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} /test )
228
228
add_executable (jinja2cpp_tests ${TestSources} ${TestHeaders} )
229
- target_link_libraries (jinja2cpp_tests gtest gtest_main nlohmann_json ${LIB_TARGET_NAME} ${EXTRA_TEST_LIBS} ${JINJA2CPP_PRIVATE_LIBS} )
229
+ target_link_libraries (jinja2cpp_tests gtest gtest_main
230
+ nlohmann_json::nlohmann_json ${LIB_TARGET_NAME} ${EXTRA_TEST_LIBS} ${JINJA2CPP_PRIVATE_LIBS} )
230
231
231
232
set_target_properties (jinja2cpp_tests PROPERTIES
232
233
CXX_STANDARD ${JINJA2CPP_CXX_STANDARD}
Original file line number Diff line number Diff line change 1
1
message (STATUS "'conan-build' dependencies mode selected for Jinja2Cpp. All dependencies are taken as a conan packages" )
2
2
3
- find_package (expected-lite)
4
- find_package (variant-lite)
5
- find_package (optional -lite)
6
- find_package (string -view-lite)
3
+ find_package (expected-lite REQUIRED)
4
+ find_package (variant-lite REQUIRED)
5
+ find_package (optional -lite REQUIRED)
6
+ find_package (string -view-lite REQUIRED)
7
+ find_package (nlohmann_json REQUIRED)
7
8
8
9
find_package (Boost)
9
10
set (CONAN_BOOST_PACKAGE_NAME Boost::Boost)
10
11
find_package (fmt)
11
- find_package (rapidjson )
12
+ find_package (RapidJSON )
12
13
13
- set (JINJA2_PRIVATE_LIBS_INT ${CONAN_BOOST_PACKAGE_NAME} fmt::fmt rapidjson::rapidjson )
14
- set (JINJA2_PUBLIC_LIBS_INT expected-lite ::expected-lite variant-lite ::variant-lite optional -lite ::optional -lite string -view-lite ::string -view-lite)
14
+ set (JINJA2_PRIVATE_LIBS_INT ${CONAN_BOOST_PACKAGE_NAME} fmt::fmt RapidJSON::RapidJSON nlohmann_json::nlohmann_json )
15
+ set (JINJA2_PUBLIC_LIBS_INT nonstd ::expected-lite nonstd ::variant-lite nonstd ::optional -lite nonstd ::string -view-lite)
You can’t perform that action at this time.
0 commit comments