diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 2304d536..c7a8c8b6 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -57,35 +57,35 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib) if(WIN32) set(ZLIB_LIBRARY $,zlibd,zlib>) else() - set(ZLIB_LIBRARY libz) + set(ZLIB_LIBRARY z) endif() set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/3rd/zlib" "${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib") link_directories(${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib) if(NOT LINUX) -set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rd/OpenSSL") -set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include") -set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib") -set(OPENSSL_LIBRARIES "ssl" "crypto") + set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rd/OpenSSL") + set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include") + set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib") + set(OPENSSL_LIBRARIES "ssl" "crypto") -set(OPENSSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL") -if(WIN32) - if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libssl.lib") - set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libcrypto.lib") - else() - set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86/libssl.lib") - set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86/libcrypto.lib") + set(OPENSSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL") + if(WIN32) + if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") + set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libssl.lib") + set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86_64/libcrypto.lib") + else() + set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/windows/x86/libssl.lib") + set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86/libcrypto.lib") + endif() + elseif(APPLE AND NOT IOS) + set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.lib") + set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libcrypto.lib") endif() -elseif(APPLE AND NOT IOS) - set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.lib") - set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libcrypto.lib") -endif() -file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH} - DESTINATION ${OPENSSL_LIBRARIES_DIR}) -file(COPY "${OPENSSL_PATH}/include" - DESTINATION ${OPENSSL_ROOT_DIR}) + file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH} + DESTINATION ${OPENSSL_LIBRARIES_DIR}) + file(COPY "${OPENSSL_PATH}/include" + DESTINATION ${OPENSSL_ROOT_DIR}) endif() add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh)