w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-02 09:05:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge r4393 from branches/wsjtx-1.4 to branches/wsjtx.

Browse Source 
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
This commit is contained in:
Bill Somerville 2014-09-27 22:54:37 +00:00
parent 1ab70990e2
commit 670ca23f42
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -843,24 +843,28 @@ if (NOT is_debug_build)
DIRECTORY DIRECTORY
${QT_PLUGINS_DIR}/platforms ${QT_PLUGINS_DIR}/platforms
${QT_PLUGINS_DIR}/audio ${QT_PLUGINS_DIR}/audio
${QT_PLUGINS_DIR}/accessible
DESTINATION ${WSJT_PLUGIN_DESTINATION} DESTINATION ${WSJT_PLUGIN_DESTINATION}
CONFIGURATIONS Release MinSizeRel CONFIGURATIONS Release MinSizeRel
#COMPONENT Runtime #COMPONENT Runtime
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}" FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}"
PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
PATTERN "*offscreen*${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 PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
) )
# install ( # install (
# DIRECTORY # DIRECTORY
# ${QT_PLUGINS_DIR}/platforms # ${QT_PLUGINS_DIR}/platforms
# ${QT_PLUGINS_DIR}/audio # ${QT_PLUGINS_DIR}/audio
# ${QT_PLUGINS_DIR}/accessible
# DESTINATION ${WSJT_PLUGIN_DESTINATION} # DESTINATION ${WSJT_PLUGIN_DESTINATION}
# CONFIGURATIONS Debug # CONFIGURATIONS Debug
# #COMPONENT Runtime # #COMPONENT Runtime
# FILES_MATCHING PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" # FILES_MATCHING PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}"
# PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
# PATTERN "*offscreen*${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 # add plugins path for Mac Bundle
@ -884,23 +888,27 @@ file (APPEND \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${WSJT_QT_CONF_DESTINATION
install ( install (
DIRECTORY DIRECTORY
${QT_PLUGINS_DIR}/platforms ${QT_PLUGINS_DIR}/platforms
${QT_PLUGINS_DIR}/accessible
DESTINATION ${WSJT_PLUGIN_DESTINATION} DESTINATION ${WSJT_PLUGIN_DESTINATION}
CONFIGURATIONS Release MinSizeRel CONFIGURATIONS Release MinSizeRel
#COMPONENT Runtime #COMPONENT Runtime
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}" FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}"
PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
PATTERN "*offscreen*${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 PATTERN "*d${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
) )
# install ( # install (
# DIRECTORY # DIRECTORY
# ${QT_PLUGINS_DIR}/platforms # ${QT_PLUGINS_DIR}/platforms
# ${QT_PLUGINS_DIR}/accessible
# DESTINATION ${WSJT_PLUGIN_DESTINATION} # DESTINATION ${WSJT_PLUGIN_DESTINATION}
# CONFIGURATIONS Debug # CONFIGURATIONS Debug
# #COMPONENT Runtime # #COMPONENT Runtime
# FILES_MATCHING PATTERN "*d${CMAKE_SHARED_LIBRARY_SUFFIX}" # FILES_MATCHING PATTERN "*d${CMAKE_SHARED_LIBRARY_SUFFIX}"
# PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
# PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE # PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
# PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
# ) # )
# add plugins path for WIN32 # add plugins path for WIN32