8000 make jinja2cpp conan-friendly again by rmorozov · Pull Request #217 · jinja2cpp/Jinja2Cpp · GitHub
[go: up one dir, main page]
Skip to content

make jinja2cpp conan-friendly again #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2021
Merged

make jinja2cpp conan-friendly again #217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8d163
make jinja2cpp conan-friendly again
rmorozov Aug 25, 2021
2e34efb
fix build
rmorozov Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix build
  • Loading branch information
@rmorozov
rmorozov committed Aug 25, 2021
commit 2e34efbef581ef988558bac96e6f3dee36ef3863
1 change: 1 addition & 0 deletions .github/workflows/linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ jobs:
mkdir $BUILD_DIRECTORY && cd $BUILD_DIRECTORY
sudo chmod gou+rw -R $WORKSPACE
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
shell: bash

- name: Test
env:
Expand Down
3 changes: 0 additions & 3 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ endif()
if (NOT DEFINED JINJA2_PRIVATE_LIBS_INT)
set(JINJA2CPP_PRIVATE_LIBS ${JINJA2CPP_PRIVATE_LIBS} Boost::variant
Boost::filesystem Boost::algorithm Boost::lexical_cast fmt RapidJson)
if(JINJA2CPP_BUILD_TESTS)
set(JINJA2CPP_PRIVATE_LIBS ${JINJA2CPP_PRIVATE_LIBS} nlohmann_json::nlohmann_json)
endif()
else ()
set (JINJA2CPP_PRIVATE_LIBS ${JINJA2_PRIVATE_LIBS_INT})
endif ()
Expand Down
0