diff --git a/.devops/install_dependencies.sh b/.devops/install_dependencies.sh index f19b67b..fb88122 100644 --- a/.devops/install_dependencies.sh +++ b/.devops/install_dependencies.sh @@ -8,14 +8,14 @@ case "$PLATFORM" in git clone https://github.com/cristianglezm/JsonBox cd JsonBox && mkdir build && cd build export JsonBox_ROOT=$(pwd)/install - cmake -DCMAKE_INSTALL_PREFIX=$JsonBox_ROOT -DCMAKE_CXX_FLAGS=-fPIC .. + cmake -DCMAKE_INSTALL_PREFIX=$JsonBox_ROOT -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-fPIC .. cmake --build . -j 4 -t install --config $BUILD_TYPE cd ../.. git clone https://github.com/google/googletest cd googletest && mkdir build && cd build export GTest_ROOT=$(pwd)/install - cmake -DCMAKE_INSTALL_PREFIX=$GTest_ROOT -DCMAKE_CXX_FLAGS=-fPIC .. + cmake -DCMAKE_INSTALL_PREFIX=$GTest_ROOT -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-fPIC .. cmake --build . -j 4 -t install --config $BUILD_TYPE cd ../.. ;; @@ -38,14 +38,14 @@ case "$PLATFORM" in git clone https://github.com/cristianglezm/JsonBox cd JsonBox && mkdir build && cd build export JsonBox_ROOT=$(pwd)/install - cmake -DCMAKE_INSTALL_PREFIX=$JsonBox_ROOT .. + cmake -DCMAKE_INSTALL_PREFIX=$JsonBox_ROOT -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. cmake --build . -j 4 -t install --config $BUILD_TYPE cd ../.. git clone https://github.com/google/googletest cd googletest && mkdir build && cd build export GTest_ROOT=$(pwd)/install - cmake -DCMAKE_INSTALL_PREFIX=$GTest_ROOT .. + cmake -DCMAKE_INSTALL_PREFIX=$GTest_ROOT -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. cmake --build . -j 4 -t install --config $BUILD_TYPE cd ../.. ;; @@ -58,6 +58,7 @@ case "$PLATFORM" in cd JsonBox && mkdir build && cd build for arch in $ARCH_ABIS;do cmake --fresh -DCMAKE_INSTALL_PREFIX=$JsonBox_ROOT \ + -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_ANDROID_NDK=$ANDROID_NDK \ -DCMAKE_ANDROID_ARCH_ABI="$arch" \