diff options
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 13e954cd57..a1b044b97d 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1895,6 +1895,8 @@ function(qt_add_plugin target) "${ARGN}" ) + qt_get_sanitized_plugin_type("${arg_TYPE}" arg_TYPE) + set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}") set(install_directory_default "${INSTALL_PLUGINSDIR}/${arg_TYPE}") set(archive_install_directory_default "${INSTALL_LIBDIR}/${arg_TYPE}") @@ -2760,7 +2762,7 @@ function(qt_add_cmake_library target) ### Define Targets: if(${arg_INTERFACE}) add_library("${target}" INTERFACE) - elseif(${arg_STATIC}) + elseif(${arg_STATIC} OR (${arg_MODULE} AND NOT BUILD_SHARED_LIBS)) add_library("${target}" STATIC) elseif(${arg_SHARED}) add_library("${target}" SHARED) @@ -3376,10 +3378,14 @@ endfunction() macro(qt_find_apple_system_frameworks) if(APPLE) find_library(FWAppKit AppKit) + find_library(FWAssetsLibrary AssetsLibrary) + find_library(FWAudioToolbox AudioToolbox) find_library(FWApplicationServices ApplicationServices) find_library(FWCarbon Carbon) find_library(FWCoreFoundation CoreFoundation) find_library(FWCoreServices CoreServices) + find_library(FWCoreGraphics CoreGraphics) + find_library(FWCoreText CoreText) find_library(FWCoreVideo CoreVideo) find_library(FWcups cups) find_library(FWDiskArbitration DiskArbitration) |