From f17483ccd2a261e63fdb94c393d28a1025b4547c Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 17 Jun 2016 10:09:47 -0400 Subject: [PATCH] Round 3 --- .travis.yml | 5 +++++ CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e71145bf..edd561be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,15 @@ os: # This makes us use Ubuntu 14 instead of 12 dist: trusty +# Notes: +# - Travis uses cmake 3.0.2 on OS X; we need 3.1 or newer (thanks tbodt) + language: c script: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libgtk-3-dev -y || sudo apt-cache search libgtk3; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew upgrade cmake; fi - mkdir build - cd build - cmake --version diff --git a/CMakeLists.txt b/CMakeLists.txt index 2226cec7..64339a0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ if(BUILD_SHARED_LIBS) target_link_libraries(${_LIBUINAME} PRIVATE ${_LIBUI_LIBS}) else() - target_link_libraries(${_LIBUINAME} + target_link_libraries(libui INTERFACE ${_LIBUI_LIBS}) endif() # on Windows the linker for static libraries is different; don't give it the flags