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

Remove libssh2 dependency

This commit is contained in:
Timothy Warren 2019-06-04 13:53:00 -04:00
parent feb97cd517
commit fcab4a890c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -46,13 +46,13 @@ find_package(wxWidgets COMPONENTS core base aui stc adv REQUIRED)
include("${wxWidgets_USE_FILE}") include("${wxWidgets_USE_FILE}")
#libssh2 #libssh2
set(CMAKE_MODULE_PATH ${Tyro_SOURCE_DIR}/cmake) #set(CMAKE_MODULE_PATH ${Tyro_SOURCE_DIR}/cmake)
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})
else (LIBSSH2_FOUND) #else (LIBSSH2_FOUND)
message ( FATAL_ERROR "Could not find LibSSH2" ) # message ( FATAL_ERROR "Could not find LibSSH2" )
endif (LIBSSH2_FOUND) #endif (LIBSSH2_FOUND)
include_directories(${INCLUDE_DIRS}) include_directories(${INCLUDE_DIRS})
@ -89,7 +89,7 @@ add_custom_command(
# base library # base library
add_library(BaseLib STATIC add_library(BaseLib STATIC
src/base/SFTP.cpp # src/base/SFTP.cpp
src/settings/Config.cpp) src/settings/Config.cpp)
# widget library # widget library
@ -119,7 +119,7 @@ else()
endif() endif()
#link it all #link it all
target_link_libraries(Tyro JsonLib BaseLib WidgetLib ${wxWidgets_LIBRARIES} ${Libssh2_LIBRARIES}) target_link_libraries(Tyro JsonLib BaseLib WidgetLib ${wxWidgets_LIBRARIES})# ${Libssh2_LIBRARIES})
################################################################################ ################################################################################
# Tests # Tests