8000 Test for Jinja2C++ 1.1 release candidate · jinja2cpp/examples-build@fe1d2aa · GitHub
[go: up one dir, main page]

Skip to content

Commit fe1d2aa

Browse files
committed
Test for Jinja2C++ 1.1 release candidate
1 parent a76ce25 commit fe1d2aa

File tree

7 files changed

+21
-6
lines changed

7 files changed

+21
-6
lines changed

conan/conan_build/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ set (TARGET_NAME jinja2cpp_build_test)
1313
set (JINJA2CPP_DEPS_MODE conan-build)
1414

1515
find_package(gtest)
16-
# set (JINJA2CPP_USE_CONANPKG_PREFIX ON)
1716
set (JINJA2CPP_DEPS_MODE conan-build CACHE STRING "" FORCE)
1817

1918
add_subdirectory (../../thirdparty/Jinja2Cpp ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jinja2cpp)
2019

2120
add_executable (${TARGET_NAME} main.cpp)
2221

23-
target_link_libraries (${TARGET_NAME} gtest::gtest jinja2cpp)
22+
target_link_libraries (${TARGET_NAME} GTest::GTest jinja2cpp)
2423
set_target_properties (${TARGET_NAME} PROPERTIES
2524
CXX_STANDARD 14
2625
CXX_STANDARD_REQUIRED ON)

external/external/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkdir -p .rapidjson-build && cd .rapidjson-build
55
echo $SRC_DIR
66
cmake ../../../thirdparty/rapidjson -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../.rapidjson-install -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF
77
cmake --build . --target install
8-
cd .. mkdir -p .jinja2cpp-build && cd .jinja2cpp-build
8+
cd .. && mkdir -p .jinja2cpp-build && cd .jinja2cpp-build
99
echo $SRC_DIR
1010
cmake ../../../thirdparty/Jinja2Cpp -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../.jinja2cpp-install -DJINJA2CPP_BUILD_TESTS=OFF -DJINJA2CPP_DEPS_MODE=external -DCMAKE_PREFIX_PATH="$SRC_DIR/../../thirdparty/expected-lite;$SRC_DIR/../../thirdparty/variant-lite;$SRC_DIR/../../thirdparty/optional-lite;$SRC_DIR/../../thirdparty/string-view-lite;$SRC_DIR/../../thirdparty/fmt;$SRC_DIR/../../thirdparty/robin-hood-hashing/src;$SRC_DIR/.rapidjson-install"
1111
cmake --build . --target install

external/external_boost/build.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ mkdir .build
1313
cd .build
1414
cmake ..\ -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -Djinja2cpp_DIR=..\.jinja2cpp-install\lib\jinja2cpp
1515
cmake --build . --config Release
16+cd ..
1617

subproject/external/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set (CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}
2525
${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/optional-lite
2626
${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/string-view-lite
2727
${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/fmt
28-
${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/rapidjson
28+
${CMAKE_CURRENT_SOURCE_DIR}/.rapidjson-install
2929
)
3030

3131
add_subdirectory (../../thirdparty/Jinja2Cpp ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jinja2cpp)

subproject/external/build.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
rmdir /S /Q .build
2+
rmdir /S /Q .rapidjson-build
3+
rmdir /S /Q .rapidjson-install
4+
5+
6+
mkdir .rapidjson-build
7+
set CMAKE_PREFIX_PATH=../../../thirdparty/expected-lite;../../../thirdparty/variant-lite;../../../thirdparty/optional-lite;../../../thirdparty/string-view-lite;../../../thirdparty/fmt;../../../thirdparty/robin-hood-hashing/src;../.rapidjson-install;
8+
cd .rapidjson-build
9+
cmake ..\..\..\thirdparty\rapidjson -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..\.rapidjson-install -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF
10+
cmake --build . --config Release --target install
11+
cd ..
212
mkdir .build
313
cd .build
414
cmake .. -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release

subproject/external/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/sh
22

3-
mkdir .build && cd .build
3+
SRC_DIR=`pwd`
4+
mkdir -p .rapidjson-build && cd .rapidjson-build
5+
echo $SRC_DIR
6+
cmake ../../../thirdparty/rapidjson -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../.rapidjson-install -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF
7+
cmake --build . --target install
8+
cd .. && mkdir -p .build && cd .build
49
cmake -DCMAKE_BUILD_TYPE=Release ..
510
cmake --build .

0 commit comments

Comments
 (0)
0