diff options
| -rw-r--r-- | CMakeLists.txt | 29 | ||||
| -rw-r--r-- | cmake/module.rules.txt | 15 | ||||
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/kvirc/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/modules/zzz_afterlastmodule/CMakeLists.txt | 4 |
5 files changed, 38 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 37f454342..c795a6514 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,10 +72,6 @@ set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS}) # Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020 set(Python_ADDITIONAL_VERSIONS "2.7") -# Allow the use of the LOCATION property -# This is no longer allowed via appveyor -# cmake_policy(SET CMP0026 OLD) - # Suffix for GNU/Linux set(LIB_SUFFIX CACHE STRING "Define suffix of directory name (32/64)" @@ -516,11 +512,6 @@ if(UNIX AND NOT APPLE) endif() endif() -get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION) -get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH) -get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) - - ############################################################################ # Check for KDE ############################################################################ @@ -662,25 +653,6 @@ if(WIN32) endif() ############################################################################ -# Check for macOS universal binary -############################################################################ - -if(APPLE) - option(WANT_UNIVERSAL_BINARY "Whether to compile a universal binary on macOS" ON) - if(WANT_UNIVERSAL_BINARY) - set(CMAKE_OSX_ARCHITECTURES x86_64) - set(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "User enabled") - #FIXME: This should be handled with CMAKE_OSX_SYSROOT (TOM) - set(CMAKE_SHARED_LINKER_FLAGS "-stdlib=libc++ -mmacosx-version-min=10.7") - set(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++ -mmacosx-version-min=10.7") - else() - set(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "No") - endif() -else() - set(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "Not available") -endif() - -############################################################################ # OpenSSL support (Secure Sockets, Certificates, Digests etc.) ############################################################################ @@ -1352,7 +1324,6 @@ message(STATUS " Debug : ${CMAKE_STATUS_DEBUG_SUPPORT}") message(STATUS " Verbose output : ${CMAKE_STATUS_VERBOSE_SUPPORT}") message(STATUS " Coexistence support : ${CMAKE_STATUS_COEXISTENCE_VER}") message(STATUS " Threading support : ${CMAKE_STATUS_THREADS_SUPPORT}") -message(STATUS " Apple universal binary : ${CMAKE_STATUS_BUILD_UNIVERSAL_BINARY}") message(STATUS " Memory profile support : ${CMAKE_STATUS_MEMORY_PROFILE_SUPPORT}") message(STATUS " Memory checks support : ${CMAKE_STATUS_MEMORY_CHECKS_SUPPORT}") message(STATUS "Features:") diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index 4a705bb37..650a4fa80 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -23,8 +23,19 @@ set_target_properties(${kvi_module_name} PROPERTIES LINK_FLAGS "${MODULE_ADDITIO set_target_properties(${kvi_module_name} PROPERTIES COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS}") if(WANT_STRIP) - get_target_property(kvi_module_location ${kvi_module_name} LOCATION) - install(CODE "EXEC_PROGRAM(${STRIP_EXECUTABLE} ARGS -s \"${kvi_module_location}\")") + IF(APPLE) + add_custom_command( + TARGET ${kvi_module_name} + POST_BUILD + COMMAND ${STRIP_EXECUTABLE} -x $<TARGET_FILE:${kvi_module_name}> + ) + ELSE() + add_custom_command( + TARGET ${kvi_module_name} + POST_BUILD + COMMAND ${STRIP_EXECUTABLE} -s $<TARGET_FILE:${kvi_module_name}> + ) + ENDIF() endif() install(TARGETS ${kvi_module_name} LIBRARY DESTINATION "${KVIRC_MOD_PATH}") diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index ad8a3134e..92d001567 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -142,8 +142,19 @@ endif() set_target_properties(${KVILIB_BINARYNAME} PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") if(WANT_STRIP) - get_target_property(KVILIB_LOCATION ${KVILIB_BINARYNAME} LOCATION) - install(CODE "exec_program(${STRIP_EXECUTABLE} ARGS -s \"${KVILIB_LOCATION}\")") + IF(APPLE) + add_custom_command( + TARGET ${KVILIB_BINARYNAME} + POST_BUILD + COMMAND ${STRIP_EXECUTABLE} -x $<TARGET_FILE:${KVILIB_BINARYNAME}> + ) + ELSE() + add_custom_command( + TARGET ${KVILIB_BINARYNAME} + POST_BUILD + COMMAND ${STRIP_EXECUTABLE} -s $<TARGET_FILE:${KVILIB_BINARYNAME}> + ) + ENDIF() endif() # Installation directives diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 461229c3e..108aed6d0 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -300,8 +300,11 @@ if(WIN32) endif() if(WANT_STRIP) - get_target_property(KVIRC_LOCATION ${KVIRC_BINARYNAME} LOCATION) - install(CODE "exec_program(${STRIP_EXECUTABLE} ARGS -s \"${KVIRC_LOCATION}\")") + add_custom_command( + TARGET ${KVIRC_BINARYNAME} + POST_BUILD + COMMAND ${STRIP_EXECUTABLE} $<TARGET_FILE:${KVIRC_BINARYNAME}> + ) endif() # Installation directives @@ -315,6 +318,9 @@ if(APPLE) set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Resources) #fixme dirty hack set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") + set(QT_LIBRARY_DIR "${Qt5Widgets_DIR}/../../") + get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH) + get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt4: codecs, iconengines, imageformats, phonon_backend, sqldrivers # qt5: audio, iconengines, imageformats, mediaservice, platforms, sqldrivers diff --git a/src/modules/zzz_afterlastmodule/CMakeLists.txt b/src/modules/zzz_afterlastmodule/CMakeLists.txt index 317ed1402..e209fe082 100644 --- a/src/modules/zzz_afterlastmodule/CMakeLists.txt +++ b/src/modules/zzz_afterlastmodule/CMakeLists.txt @@ -1,5 +1,9 @@ # CMakeLists.txt for src/modules/zzz_afterlastmodule if(APPLE) + set(QT_LIBRARY_DIR "${Qt5Widgets_DIR}/../../") + get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH) + get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) + install(CODE " file(GLOB_RECURSE KVIRC_INSTALLED_MODULES \"${KVIRC_MOD_PATH}/*.so\") |