From 13215ced93b91a91d68bfe337a1f94cd8e97bcda Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 20 Mar 2019 09:35:02 -0400 Subject: [PATCH] Disable the native example on CI --- .travis.yml | 2 +- examples/hello_triangle_c/CMakeLists.txt | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7704e6aa..a46943a0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,4 +43,4 @@ before_install: script: - cargo test - - if [[ $TRAVIS_OS_NAME == "osx" ]]; then (brew update && brew upgrade cmake && brew install glfw3 && cd wgpu-native && cargo build --features=local,gfx-backend-metal && cd ../examples/hello_triangle_c && mkdir build && cd build && cmake .. && make); fi + #- if [[ $TRAVIS_OS_NAME == "osx" ]]; then (brew update && brew upgrade cmake && brew install glfw3 && cd wgpu-native && cargo build --features=local,gfx-backend-metal && cd ../examples/hello_triangle_c && mkdir build && cd build && cmake .. && make); fi diff --git a/examples/hello_triangle_c/CMakeLists.txt b/examples/hello_triangle_c/CMakeLists.txt index 204b0c468..dcab20eb0 100644 --- a/examples/hello_triangle_c/CMakeLists.txt +++ b/examples/hello_triangle_c/CMakeLists.txt @@ -10,18 +10,16 @@ if(MSVC) target_compile_options(${TARGET_NAME} PRIVATE /W4) add_compile_definitions(WGPU_TARGET=WGPU_TARGET_WINDOWS) set(GLFW_LIBRARY glfw3) +elif(APPLE) + target_compile_options(${TARGET_NAME} PRIVATE -x objective-c) + add_compile_definitions(WGPU_TARGET=WGPU_TARGET_MACOS) + set(OS_LIBRARIES "-framework Cocoa" "-framework CoreVideo" "-framework IOKit" "-framework QuartzCore") else(MSVC) target_compile_options(${TARGET_NAME} PRIVATE -Wall -Wextra -pedantic) add_compile_definitions(WGPU_TARGET=WGPU_TARGET_LINUX) set(GLFW_LIBRARY glfw) endif(MSVC) -if(APPLE) - add_compile_definitions(WGPU_TARGET=WGPU_TARGET_MACOS) - set(OS_LIBRARIES "-framework Cocoa" "-framework CoreVideo" "-framework IOKit" "-framework QuartzCore") - target_compile_options(${TARGET_NAME} PRIVATE -x objective-c) -endif(APPLE) - find_package(glfw3) find_library(WGPU_LIBRARY wgpu_native