summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2019-11-06 08:58:34 +0100
committerAndreas Schneider <asn@cryptomilk.org>2019-11-07 14:00:15 +0100
commit729c92606c88b60e7c255d393756d1d3b7e30698 (patch)
tree638ae88dd1c6000a07f1a14c61cfc4b03c9701ee
parent498b63949ef7660dc82934890a276b1bcc738948 (diff)
downloadlibssh-729c92606c88b60e7c255d393756d1d3b7e30698.tar.gz
libssh-729c92606c88b60e7c255d393756d1d3b7e30698.tar.xz
libssh-729c92606c88b60e7c255d393756d1d3b7e30698.zip
cmake: Remove WITH_STATIC_LIB
We will honor BUILD_SHARED_LIBS from cmake next. Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
-rw-r--r--CMakeLists.txt1
-rw-r--r--DefineOptions.cmake9
-rw-r--r--src/CMakeLists.txt9
3 files changed, 2 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21d6fcad..d12dbbfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,7 +222,6 @@ message(STATUS "Server support : ${WITH_SERVER}")
message(STATUS "GSSAPI support : ${WITH_GSSAPI}")
message(STATUS "GEX support : ${WITH_GEX}")
message(STATUS "Pcap debugging support : ${WITH_PCAP}")
-message(STATUS "With static library: ${WITH_STATIC_LIB}")
message(STATUS "Unit testing: ${UNIT_TESTING}")
message(STATUS "Client code testing: ${CLIENT_TESTING}")
message(STATUS "Blowfish cipher support: ${WITH_BLOWFISH_CIPHER}")
diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index 52b68a73..ac81b47b 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -2,7 +2,6 @@ option(WITH_GSSAPI "Build with GSSAPI support" ON)
option(WITH_ZLIB "Build with ZLIB support" ON)
option(WITH_SFTP "Build with SFTP support" ON)
option(WITH_SERVER "Build with SSH server support" ON)
-option(WITH_STATIC_LIB "Build with a static library" OFF)
option(WITH_DEBUG_CRYPTO "Build with cryto debug output" OFF)
option(WITH_DEBUG_PACKET "Build with packet debug output" OFF)
option(WITH_DEBUG_CALLTRACE "Build with calltrace debug output" ON)
@@ -34,13 +33,9 @@ if (WITH_BENCHMARKS)
set(CLIENT_TESTING ON)
endif()
-if (WITH_STATIC_LIB)
- set(BUILD_STATIC_LIB ON)
-endif (WITH_STATIC_LIB)
-
-if (UNIT_TESTING)
+if (UNIT_TESTING OR CLIENT_TESTING OR SERVER_TESTING)
set(BUILD_STATIC_LIB ON)
-endif (UNIT_TESTING)
+endif()
if (WITH_NACL)
set(WITH_NACL ON)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b01c0a8..04d3719f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -406,15 +406,6 @@ if (BUILD_STATIC_LIB)
"-DLIBSSH_STATIC"
)
endif (WIN32)
-
- if (WITH_STATIC_LIB)
- install(TARGETS
- ${LIBSSH_STATIC_LIBRARY}
- DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/${OUTPUT_SUFFIX}
- COMPONENT
- libraries)
- endif (WITH_STATIC_LIB)
endif (BUILD_STATIC_LIB)
message(STATUS "Threads_FOUND=${Threads_FOUND}")