From 8c9a645e88f4308f5a683b7872d7fb129a8b67cf Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 27 Sep 2014 22:54:37 +0000 Subject: [PATCH] Merge r4393 from branches/wsjtx-1.4 to branches/wsjtx. Add Qt assistive technology support to release builds. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4394 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2eb08754..3b947ff4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -843,24 +843,28 @@ if (NOT is_debug_build) DIRECTORY ${QT_PLUGINS_DIR}/platforms ${QT_PLUGINS_DIR}/audio + ${QT_PLUGINS_DIR}/accessible DESTINATION ${WSJT_PLUGIN_DESTINATION} CONFIGURATIONS Release MinSizeRel #COMPONENT Runtime FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}" PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE + PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE ) # install ( # DIRECTORY # ${QT_PLUGINS_DIR}/platforms # ${QT_PLUGINS_DIR}/audio + # ${QT_PLUGINS_DIR}/accessible # DESTINATION ${WSJT_PLUGIN_DESTINATION} # CONFIGURATIONS Debug # #COMPONENT Runtime # FILES_MATCHING PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" # PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE + # PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # ) # add plugins path for Mac Bundle @@ -884,23 +888,27 @@ file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION install ( DIRECTORY ${QT_PLUGINS_DIR}/platforms + ${QT_PLUGINS_DIR}/accessible DESTINATION ${WSJT_PLUGIN_DESTINATION} CONFIGURATIONS Release MinSizeRel #COMPONENT Runtime FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}" PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE + PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*d${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE ) # install ( # DIRECTORY # ${QT_PLUGINS_DIR}/platforms + # ${QT_PLUGINS_DIR}/accessible # DESTINATION ${WSJT_PLUGIN_DESTINATION} # CONFIGURATIONS Debug # #COMPONENT Runtime # FILES_MATCHING PATTERN "*d${CMAKE_SHARED_LIBRARY_SUFFIX}" # PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE + # PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # ) # add plugins path for WIN32