8000 Fix CI build problems · jinja2cpp/examples-build@a76ce25 · GitHub
[go: up one dir, main page]
Skip to content

Commit a76ce25

Browse files
flexferrumflexferrum
committed
Fix CI build problems
1 parent 746df33 commit a76ce25

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

‎appveyor.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ configuration:
1212

1313
environment:
1414
matrix:
15+
- BUILD_PLATFORM: x64
16+
EXAMPLE_PATH: external/external
17+
- BUILD_PLATFORM: x64
18+
EXAMPLE_PATH: external/internal
1519
- BUILD_PLATFORM: x64
1620
EXAMPLE_PATH: conan/0.9.1
1721
- BUILD_PLATFORM: x64
1822
EXAMPLE_PATH: conan/1.0.0
1923
- BUILD_PLATFORM: x64
2024
EXAMPLE_PATH: conan/conan_build
21-
- BUILD_PLATFORM: x64
22-
EXAMPLE_PATH: external/internal
2325
- BUILD_PLATFORM: x64
2426
EXAMPLE_PATH: external/external_boost
25-
- BUILD_PLATFORM: x64
26-
EXAMPLE_PATH: external/external
2727
- BUILD_PLATFORM: x64
2828
EXAMPLE_PATH: subproject/internal
2929
- BUILD_PLATFORM: x64
@@ -51,10 +51,10 @@ init:
5151

5252
build_script:
5353
- git submodule update --init
54-
- cd %EXAMPLE_PATH%
54+
- cd C:\projects\examples-build\%EXAMPLE_PATH%
5555
- build.bat
5656

5757
test_script:
58-
- cd %EXAMPLE_PATH%
58+
- cd C:\projects\examples-build\%EXAMPLE_PATH%
5959
- test.bat
6060
# - ctest -C Release -V

‎external/external/build.bat

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
rmdir /S /Q .build
22
rmdir /S /Q .jinja2cpp-build
33
rmdir /S /Q .jinja2cpp-install
4+
rmdir /S /Q .rapidjson-build
5+
rmdir /S /Q .rapidjson-install
46

57
mkdir .jinja2cpp-build
68
mkdir .jinja2cpp-install
9+
mkdir .rapidjson-build
10+
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;
11+
cd .rapidjson-build
12+
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
13+
cmake --build . --config Release --target install
14+
cd ..
715
cd .jinja2cpp-build
8-
set CMAKE_PREFIX_PATH=../../../thirdparty/expected-lite;../../../thirdparty/variant-lite;../../../thirdparty/optional-lite;../../../thirdparty/string-view-lite;../../../thirdparty/fmt;../../../thirdparty/robin-hood-hashing/src;../../../thirdparty/rapidjson;
916
cmake ..\..\..\thirdparty\Jinja2Cpp -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=..\.jinja2cpp-install -DJINJA2CPP_BUILD_TESTS=OFF -DJINJA2CPP_DEPS_MODE=external
1017
cmake --build . --config Release --target install
1118
cd ..

‎external/external/build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
#!/bin/sh
22

33
SRC_DIR=`pwd`
4-
mkdir -p .jinja2cpp-build && cd .jinja2cpp-build
4+
mkdir -p .rapidjson-build && cd .rapidjson-build
55
echo $SRC_DIR
6-
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"
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 .jinja2cpp-build && cd .jinja2cpp-build
9+
echo $SRC_DIR
10+
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"
711
cmake --build . --target install
812
cd .. && mkdir -p .build && cd .build
913
cmake -DCMAKE_BUILD_TYPE=Release -Djinja2cpp_DIR=../.jinja2cpp-install/lib/jinja2cpp ..

0 commit comments

Comments
 (0)
0