timw4mail
/
Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to build Tyro on travis CI

This commit is contained in:
Tim Warren 2015-11-18 15:43:04 -05:00
parent 1550fc3b60
commit 89fc95cd36
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,5 +1,5 @@
sudo: required sudo: required
dist: trusty #dist: trusty
language: cpp language: cpp
before_install: before_install:
@ -23,7 +23,7 @@ addons:
- gcc-4.8 - gcc-4.8
- g++-4.8 - g++-4.8
- clang - clang
- libgtk2.0-dev - libwxgtk3.0-dev
- libssh2-dev - libssh2-dev
script: make clean run-tests script: make clean run-tests

4
CMakeLists.txt
View File

@ -37,7 +37,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
endif() endif()
# wxwidgets stuff # wxwidgets stuff
set(wxWidgets_CONFIG_OPTIONS --static) #set(wxWidgets_CONFIG_OPTIONS --static)
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
hunter_add_package(wxWidgets) hunter_add_package(wxWidgets)
endif() endif()
@ -132,4 +132,4 @@ file(GLOB test_SRC
) )
add_executable(test_runner ${test_SRC}) add_executable(test_runner ${test_SRC})
target_link_libraries(test_runner ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES} JsonLib BaseLib WidgetLib) target_link_libraries(test_runner ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES} JsonLib BaseLib WidgetLib)