diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-28 19:40:48 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-28 19:40:48 +0000 |
| commit | e34c90d6f6c1a1ec8f3357639ab395dceb02ecc1 (patch) | |
| tree | cf2248b696b15f4340f6221e79ccf509eaf5d42f /BuildTools/Scripts | |
| parent | Update to linux/mac build scripts to not terminate current shell (diff) | |
| download | DiligentCore-e34c90d6f6c1a1ec8f3357639ab395dceb02ecc1.tar.gz DiligentCore-e34c90d6f6c1a1ec8f3357639ab395dceb02ecc1.zip | |
Fixed MacOS/clang build issues; enabled building test projects on travis
Diffstat (limited to 'BuildTools/Scripts')
| -rwxr-xr-x | BuildTools/Scripts/travis/build_install.sh | 6 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/validate_format.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/BuildTools/Scripts/travis/build_install.sh b/BuildTools/Scripts/travis/build_install.sh index fc5b608f..b2105d25 100755 --- a/BuildTools/Scripts/travis/build_install.sh +++ b/BuildTools/Scripts/travis/build_install.sh @@ -2,15 +2,15 @@ mkdir build cd build if [ "$TRAVIS_OS_NAME" = "linux" ]; then - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=${CONFIG} -DCMAKE_INSTALL_PREFIX=install + cmake .. -G "Unix Makefiles" $1 -DCMAKE_BUILD_TYPE=${CONFIG} -DCMAKE_INSTALL_PREFIX=install cmake --build . --target install fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$IOS" = "true" ]; then - cmake .. -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DIOS_ARCH=arm64 -DVULKAN_SDK="$VULKAN_SDK" -DCMAKE_INSTALL_PREFIX=install -G "Xcode" + cmake .. $1 -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DIOS_ARCH=arm64 -DVULKAN_SDK="$VULKAN_SDK" -DCMAKE_INSTALL_PREFIX=install -G "Xcode" else - cmake .. -DCMAKE_INSTALL_PREFIX=install -G "Xcode" + cmake .. $1 -DCMAKE_INSTALL_PREFIX=install -G "Xcode" fi cmake --build . --target install --config ${CONFIG} | xcpretty && return ${PIPESTATUS[0]} fi diff --git a/BuildTools/Scripts/travis/validate_format.sh b/BuildTools/Scripts/travis/validate_format.sh index 39f40554..30ef27b0 100755 --- a/BuildTools/Scripts/travis/validate_format.sh +++ b/BuildTools/Scripts/travis/validate_format.sh @@ -1,4 +1,4 @@ -# The script must be run from FormatValidatio folder +# The script must be run from FormatValidation folder if [ "$TRAVIS_OS_NAME" = "osx" ]; then . ./validate_format_mac.sh |