diff --git a/.travis.yml b/.travis.yml index 5787bcc238..2d681361db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,11 @@ matrix: # sudo: required # language: cpp # mac_cmake - # - os: osx - # env: BUILD_TARGET=mac_cmake - # language: cpp - # osx_image: xcode10.3 - # sudo: required + - os: osx + env: BUILD_TARGET=mac_cmake + language: cpp + osx_image: xcode11 + sudo: required # iOS_cmake - os: osx env: BUILD_TARGET=ios_cmake diff --git a/tools/appveyor-scripts/build.ps1 b/tools/appveyor-scripts/build.ps1 index b5b3ef5cb4..5a110a9562 100644 --- a/tools/appveyor-scripts/build.ps1 +++ b/tools/appveyor-scripts/build.ps1 @@ -108,7 +108,7 @@ If ($env:build_type -eq "android_cpp_tests") { # if ($lastexitcode -ne 0) {throw} # mkdir return no-zero Push-Location $env:APPVEYOR_BUILD_FOLDER\win32-build - & cmake -A Win32 -DCMAKE_BUILD_TYPE=Release .. + & cmake -A Win32 -DCMAKE_BUILD_TYPE=Release .. -DBUILD_EXTENSION_IMGUI=ON if ($lastexitcode -ne 0) {throw} & cmake --build . --config Release --target cpp-tests diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index e57417048a..eaebef33b6 100644 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -49,9 +49,8 @@ function build_mac_cmake() # cd $COCOS2DX_ROOT/cocos_new_test cd $COCOS2DX_ROOT mkdir -p build - cd build - cmake .. -GXcode - cmake --build . --config Release -- -quiet + cmake -S . -B build -GXcode -DBUILD_EXTENSION_IMGUI=ON + cmake --build build --config Release -- -quiet #xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES build | xcpretty ##the following commands must not be removed #xcodebuild -project Cocos2d-x.xcodeproj -alltargets -jobs $NUM_OF_CORES build