From 4f3ee2fc7e24668eee3f72c59d3766a7ba2d49c2 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Sun, 3 Nov 2013 13:45:15 +0100 Subject: Fix examples compilation on OSX (libargp) --- cmake/Modules/DefinePlatformDefaults.cmake | 4 ++++ examples/CMakeLists.txt | 6 +++--- examples/samplesshd-tty.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/DefinePlatformDefaults.cmake b/cmake/Modules/DefinePlatformDefaults.cmake index 502d936b..77f8a461 100644 --- a/cmake/Modules/DefinePlatformDefaults.cmake +++ b/cmake/Modules/DefinePlatformDefaults.cmake @@ -26,3 +26,7 @@ endif (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") if (CMAKE_SYSTEM_NAME MATCHES "OS2") set(OS2 TRUE) endif (CMAKE_SYSTEM_NAME MATCHES "OS2") + +if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + set (OSX TRUE) +endif (CMAKE_SYSTEM_NAME MATCHES "Darwin") diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index fc1c9341..c155e097 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -11,9 +11,9 @@ include_directories( ${CMAKE_BINARY_DIR} ) -if (BSD OR SOLARIS) +if (BSD OR SOLARIS OR OSX) find_package(Argp) -endif (BSD OR SOLARIS) +endif (BSD OR SOLARIS OR OSX) if (UNIX AND NOT WIN32) add_executable(libssh_scp libssh_scp.c ${examples_SRCS}) @@ -28,7 +28,7 @@ if (UNIX AND NOT WIN32) if (WITH_SERVER) if (HAVE_LIBUTIL) add_executable(samplesshd-tty samplesshd-tty.c) - target_link_libraries(samplesshd-tty ${LIBSSH_SHARED_LIBRARY} util) + target_link_libraries(samplesshd-tty ${LIBSSH_SHARED_LIBRARY} ${ARGP_LIBRARIES} util) endif (HAVE_LIBUTIL) endif (WITH_SERVER) diff --git a/examples/samplesshd-tty.c b/examples/samplesshd-tty.c index 7ed70d3d..b9831855 100644 --- a/examples/samplesshd-tty.c +++ b/examples/samplesshd-tty.c @@ -25,7 +25,9 @@ clients must be made or how a client should react. #include #include #include +#ifdef HAVE_PTY_H #include +#endif #define SSHD_USER "libssh" #define SSHD_PASSWORD "libssh" -- cgit v1.2.3