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

More config fiddling

Browse Source
This commit is contained in:
Tim Warren 2015-10-29 14:09:27 -04:00
parent 49a446c364
commit e9c46642f9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -24,5 +24,6 @@ addons:
- g++-4.8 - g++-4.8
- clang - clang
- libgtk2.0-dev - libgtk2.0-dev
- libssh2-dev
script: make clean run-tests script: make clean run-tests

9
CMakeLists.txt
View File

@ -31,12 +31,11 @@ else()
endif() endif()
# Silence some useless errors # Silence some useless errors
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
endif() endif()
# wxwidgets stuff # wxwidgets stuff
set(wxWidgets_CONFIG_OPTIONS --static) set(wxWidgets_CONFIG_OPTIONS --static)
unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT) unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT)
hunter_add_package(wxWidgets) hunter_add_package(wxWidgets)
@ -45,7 +44,9 @@ include("${wxWidgets_USE_FILE}")
#libssh2 #libssh2
set(CMAKE_MODULE_PATH ${Tyro_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${Tyro_SOURCE_DIR}/cmake)
hunter_add_package(libssh2) if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
hunter_add_package(libssh2)
endif()
find_package(LibSSH2 REQUIRED) find_package(LibSSH2 REQUIRED)
if (LIBSSH2_FOUND) if (LIBSSH2_FOUND)
set (INCLUDE_DIRS ${INCLUDE_DIRS} ${LIBSSH2_INCLUDE_DIR}) set (INCLUDE_DIRS ${INCLUDE_DIRS} ${LIBSSH2_INCLUDE_DIR})