lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-05-17 19:21:11 +03:00
Code

cmake: Fix static .lib overwriting on Windows.

Browse Source
This commit is contained in:
Andreas Schneider 2011-06-01 14:52:27 +02:00
parent 94ca5ed3df
commit 1880ef54d2
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -190,6 +190,11 @@ install(
if (WITH_STATIC_LIB) if (WITH_STATIC_LIB)
add_library(${LIBSSH_STATIC_LIBRARY} STATIC ${libssh_SRCS}) add_library(${LIBSSH_STATIC_LIBRARY} STATIC ${libssh_SRCS})
if (MSVC)
set(OUTPUT_SUFFIX static)
else (MSVC)
set(OUTPUT_SUFFIX )
endif (MSVC)
set_target_properties( set_target_properties(
${LIBSSH_STATIC_LIBRARY} ${LIBSSH_STATIC_LIBRARY}
PROPERTIES PROPERTIES
@ -199,6 +204,8 @@ if (WITH_STATIC_LIB)
${LIBRARY_SOVERSION} ${LIBRARY_SOVERSION}
OUTPUT_NAME OUTPUT_NAME
ssh ssh
ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_SUFFIX}
) )
if (WIN32) if (WIN32)
@ -214,7 +221,7 @@ if (WITH_STATIC_LIB)
TARGETS TARGETS
${LIBSSH_STATIC_LIBRARY} ${LIBSSH_STATIC_LIBRARY}
DESTINATION DESTINATION
${LIB_INSTALL_DIR} ${LIB_INSTALL_DIR}/${OUTPUT_SUFFIX}
COMPONENT COMPONENT
libraries libraries
) )

23
src/threads/CMakeLists.txt
View File

@ -86,6 +86,12 @@ install(
if (WITH_STATIC_LIB) if (WITH_STATIC_LIB)
add_library(${LIBSSH_THREADS_STATIC_LIBRARY} STATIC ${libssh_threads_SRCS}) add_library(${LIBSSH_THREADS_STATIC_LIBRARY} STATIC ${libssh_threads_SRCS})
if (MSVC)
set(OUTPUT_SUFFIX static)
else (MSVC)
set(OUTPUT_SUFFIX )
endif (MSVC)
set_target_properties( set_target_properties(
${LIBSSH_THREADS_STATIC_LIBRARY} ${LIBSSH_THREADS_STATIC_LIBRARY}
PROPERTIES PROPERTIES
@ -93,15 +99,26 @@ if (WITH_STATIC_LIB)
${LIBRARY_VERSION} ${LIBRARY_VERSION}
SOVERSION SOVERSION
${LIBRARY_SOVERSION} ${LIBRARY_SOVERSION}
COMPILE_FLAGS OUTPUT_NAME
"-DLIBSSH_STATIC" ssh_threads
ARCHIVE_OUTPUT_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_SUFFIX}
) )
if (WIN32)
set_target_properties(
${LIBSSH_THREADS_STATIC_LIBRARY}
PROPERTIES
COMPILE_FLAGS
"-DLIBSSH_STATIC"
)
endif (WIN32)
install( install(
TARGETS TARGETS
${LIBSSH_THREADS_STATIC_LIBRARY} ${LIBSSH_THREADS_STATIC_LIBRARY}
DESTINATION DESTINATION
${LIB_INSTALL_DIR} ${LIB_INSTALL_DIR}/${OUTPUT_SUFFIX}
COMPONENT COMPONENT
libraries libraries
) )