diff options
| author | Egor <egor.yusov@gmail.com> | 2019-11-28 02:36:36 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2019-11-28 02:36:36 +0000 |
| commit | ff447b57f5b364be1a4a5d7e07c8183998aa2112 (patch) | |
| tree | c7ac6b21218775554e18da8d346a31ba2d87619f /BuildTools/Scripts | |
| parent | travis: added build scripts with common build instructions (diff) | |
| download | DiligentCore-ff447b57f5b364be1a4a5d7e07c8183998aa2112.tar.gz DiligentCore-ff447b57f5b364be1a4a5d7e07c8183998aa2112.zip | |
Fixed travis build
Diffstat (limited to 'BuildTools/Scripts')
| -rwxr-xr-x | BuildTools/Scripts/travis/build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/Scripts/travis/build.sh b/BuildTools/Scripts/travis/build.sh index 9f431ec1..d0e7b650 100755 --- a/BuildTools/Scripts/travis/build.sh +++ b/BuildTools/Scripts/travis/build.sh @@ -2,15 +2,15 @@ mkdir build cd build if [ "$TRAVIS_OS_NAME" = "linux" ]; then - cmake .. -G "Unix Makefiles" -DDILIGENT_ENABLE_TESTS=TRUE -DCMAKE_BUILD_TYPE=${CONFIG} + cmake .. -G "Unix Makefiles" $1 -DCMAKE_BUILD_TYPE=${CONFIG} cmake --build . fi | if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$IOS" = "true" ]; then - cmake .. -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR64 -DDILIGENT_ENABLE_TESTS=TRUE -G "Xcode" + cmake .. -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR64 $1 -G "Xcode" else - cmake .. -DDILIGENT_ENABLE_TESTS=TRUE -G "Xcode" + cmake .. $1 -G "Xcode" fi xcodebuild -configuration ${CONFIG} | xcpretty fi |
