interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Round 3

This commit is contained in:
Pietro Gagliardi 2016-06-17 10:09:47 -04:00
parent 721a934bf0
commit f17483ccd2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -5,10 +5,15 @@ os:
# This makes us use Ubuntu 14 instead of 12 # This makes us use Ubuntu 14 instead of 12
dist: trusty dist: trusty
# Notes:
# - Travis uses cmake 3.0.2 on OS X; we need 3.1 or newer (thanks tbodt)
language: c language: c
script: script:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi - 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" == "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 - mkdir build
- cd build - cd build
- cmake --version - cmake --version

2
CMakeLists.txt
View File

@ -148,7 +148,7 @@ if(BUILD_SHARED_LIBS)
target_link_libraries(${_LIBUINAME} target_link_libraries(${_LIBUINAME}
PRIVATE ${_LIBUI_LIBS}) PRIVATE ${_LIBUI_LIBS})
else() else()
target_link_libraries(${_LIBUINAME} target_link_libraries(libui
INTERFACE ${_LIBUI_LIBS}) INTERFACE ${_LIBUI_LIBS})
endif() endif()
# on Windows the linker for static libraries is different; don't give it the flags # on Windows the linker for static libraries is different; don't give it the flags