Round 3
This commit is contained in:
parent
721a934bf0
commit
f17483ccd2
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue