From e9c46642f9834be5dc2e04dcfed35e110b9d7864 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Thu, 29 Oct 2015 14:09:27 -0400 Subject: [PATCH] More config fiddling --- .travis.yml | 1 + CMakeLists.txt | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a34b49e..1d72748 100755 --- a/.travis.yml +++ b/.travis.yml @@ -24,5 +24,6 @@ addons: - g++-4.8 - clang - libgtk2.0-dev + - libssh2-dev script: make clean run-tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aedbf9..191bb13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,12 +31,11 @@ else() endif() # Silence some useless errors -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression) +if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression") endif() # wxwidgets stuff - set(wxWidgets_CONFIG_OPTIONS --static) unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT) hunter_add_package(wxWidgets) @@ -45,7 +44,9 @@ include("${wxWidgets_USE_FILE}") #libssh2 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) if (LIBSSH2_FOUND) set (INCLUDE_DIRS ${INCLUDE_DIRS} ${LIBSSH2_INCLUDE_DIR})