QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-08 08:49:34 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "properly support co-existing qt4 and qt5 versions""

Browse Source 
This reverts commit 99128312fb91bc5f8e6320fe052bbaf7648102fe.
This commit is contained in:
Harald Sitter 2015-01-14 13:51:07 +01:00
parent 99128312fb
commit b7f47694f8
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -59,6 +59,7 @@ if (Qt5Core_FOUND)
include(GNUInstallDirs) include(GNUInstallDirs)
setup_qt5_dirs() setup_qt5_dirs()
set(QCA_QT_PC_VERSION "Qt5Core") set(QCA_QT_PC_VERSION "Qt5Core")
set(QCA_SUFFIX "qt5")
else() else()
set(QT_MIN_VERSION "4.7.0") set(QT_MIN_VERSION "4.7.0")
set(QT_USE_IMPORTED_TARGETS ON) set(QT_USE_IMPORTED_TARGETS ON)
@ -392,10 +393,10 @@ endif(DOXYGEN_FOUND)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
configure_package_config_file( configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/${QCA_CONFIG_NAME_BASE}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
) )
write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion) write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
if(NOT DEVELOPER_MODE) if(NOT DEVELOPER_MODE)
@ -463,10 +464,10 @@ if(NOT DEVELOPER_MODE)
endif() endif()
endif() endif()
install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake) install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake)
install(FILES install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/${QCA_CONFIG_NAME_BASE}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake"
DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE}
) )
endif() endif()

4
QcaConfig.cmake.in
View File

@ -1,7 +1,7 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
if(NOT TARGET qca) if(NOT TARGET @QCA_CONFIG_NAME_BASE@)
include("${CMAKE_CURRENT_LIST_DIR}/@QCA_CONFIG_NAME_BASE@Targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@QCA_CONFIG_NAME_BASE@Targets.cmake")
endif() endif()
set(Qca_LIBRARY qca) set(Qca_LIBRARY @QCA_CONFIG_NAME_BASE@)

4
src/CMakeLists.txt
View File

@ -163,12 +163,12 @@ set_target_properties(${QCA_LIB_NAME} PROPERTIES
DEFINE_SYMBOL QCA_MAKEDLL DEFINE_SYMBOL QCA_MAKEDLL
PUBLIC_HEADER "${public_HEADERS}" PUBLIC_HEADER "${public_HEADERS}"
FRAMEWORK ${OSX_FRAMEWORK} FRAMEWORK ${OSX_FRAMEWORK}
EXPORT_NAME qca EXPORT_NAME ${QCA_LIB_NAME}
) )
if(NOT DEVELOPER_MODE) if(NOT DEVELOPER_MODE)
install(TARGETS ${QCA_LIB_NAME} install(TARGETS ${QCA_LIB_NAME}
EXPORT QCATargets EXPORT ${QCA_CONFIG_NAME_BASE}Targets
LIBRARY DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" LIBRARY DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_BINARY_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_BINARY_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"