diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,11 +8,7 @@ project(qca) -if(NOT APPLE) - cmake_minimum_required(VERSION 2.8.12) -else() - cmake_minimum_required(VERSION 3.0) -endif() +cmake_minimum_required(VERSION 3.4) set(QCA_LIB_MAJOR_VERSION "2") set(QCA_LIB_MINOR_VERSION "2") diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake --- a/cmake/modules/QcaMacro.cmake +++ b/cmake/modules/QcaMacro.cmake @@ -11,15 +11,14 @@ ENDMACRO(QT4_GET_MOC_INC_DIRS) MACRO(SETUP_QT5_DIRS) - GET_TARGET_PROPERTY(QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} LOCATION) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QT_LIBRARY_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PREFIX" OUTPUT_VARIABLE QT_PREFIX_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" OUTPUT_VARIABLE QT_PLUGINS_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QT_BINARY_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QT_HEADERS_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QT_DOC_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DATA" OUTPUT_VARIABLE QT_DATA_DIR ) - EXEC_PROGRAM( ${QMAKE_EXECUTABLE} ARGS "-query QT_HOST_DATA" OUTPUT_VARIABLE QT_ARCHDATA_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QT_LIBRARY_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_PREFIX" OUTPUT_VARIABLE QT_PREFIX_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_PLUGINS" OUTPUT_VARIABLE QT_PLUGINS_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QT_BINARY_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QT_HEADERS_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QT_DOC_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_INSTALL_DATA" OUTPUT_VARIABLE QT_DATA_DIR ) + EXEC_PROGRAM( $ ARGS "-query QT_HOST_DATA" OUTPUT_VARIABLE QT_ARCHDATA_DIR ) SET( QT_MKSPECS_DIR "${QT_ARCHDATA_DIR}/mkspecs" ) ENDMACRO(SETUP_QT5_DIRS) ELSE (Qt5Core_FOUND) @@ -102,13 +101,8 @@ macro(install_pdb TARGET INSTALL_PATH) if(MSVC) - get_target_property(LOCATION ${TARGET} LOCATION_DEBUG) - string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") - install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug) - - get_target_property(LOCATION ${TARGET} LOCATION_RELWITHDEBINFO) - string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") - install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo) + install(FILES $ DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug) + install(FILES $ DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo) endif(MSVC) endmacro(install_pdb) diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt --- a/plugins/qca-ossl/CMakeLists.txt +++ b/plugins/qca-ossl/CMakeLists.txt @@ -56,28 +56,16 @@ set_property(TARGET qca-ossl PROPERTY SUFFIX ".dylib") endif() - include_directories(${OPENSSL_INCLUDE_DIR}) target_link_libraries(qca-ossl ${QT_QTCORE_LIBRARY}) target_link_libraries(qca-ossl ${QCA_LIB_NAME}) - target_link_libraries(qca-ossl ${OPENSSL_LIBRARIES}) - - if(APPLE) - target_link_libraries(qca-ossl crypto) - endif(APPLE) - - if(WIN32) - add_definitions(-DOSSL_097) - target_link_libraries(qca-ossl gdi32) - target_link_libraries(qca-ossl wsock32) - target_link_libraries(qca-ossl ${OPENSSL_EAY_LIBRARIES}) - endif(WIN32) + target_link_libraries(qca-ossl OpenSSL::SSL OpenSSL::Crypto) if(NOT DEVELOPER_MODE) install(TARGETS qca-ossl LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") - + install_pdb(qca-ossl ${QCA_CRYPTO_INSTALL_DIR}) endif()