Exclude more debug libs (on OSX), debug builds include debug libs.
This commit is contained in:
parent
f56eff04ef
commit
75c4d97b90
@ -508,6 +508,23 @@ ENDIF()
|
|||||||
|
|
||||||
#### Dist package logic ####
|
#### Dist package logic ####
|
||||||
|
|
||||||
|
if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
|
||||||
|
# Image formats
|
||||||
|
INSTALL(
|
||||||
|
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
||||||
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
|
COMPONENT Runtime
|
||||||
|
REGEX "tga|svg|tiff|mng" EXCLUDE
|
||||||
|
)
|
||||||
|
|
||||||
|
# Platform plugins
|
||||||
|
INSTALL(
|
||||||
|
DIRECTORY "${QT_PLUGINS_DIR}/platforms"
|
||||||
|
DESTINATION ${PLUGIN_DEST_DIR}
|
||||||
|
COMPONENT Runtime
|
||||||
|
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
||||||
|
)
|
||||||
|
else()
|
||||||
# Image formats
|
# Image formats
|
||||||
INSTALL(
|
INSTALL(
|
||||||
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
|
||||||
@ -515,6 +532,7 @@ INSTALL(
|
|||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "tga|svg|tiff|mng" EXCLUDE
|
REGEX "tga|svg|tiff|mng" EXCLUDE
|
||||||
REGEX "d\\." EXCLUDE
|
REGEX "d\\." EXCLUDE
|
||||||
|
REGEX "_debug\\." EXCLUDE
|
||||||
)
|
)
|
||||||
|
|
||||||
# Platform plugins
|
# Platform plugins
|
||||||
@ -524,7 +542,9 @@ INSTALL(
|
|||||||
COMPONENT Runtime
|
COMPONENT Runtime
|
||||||
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
REGEX "minimal|linuxfb|offscreen" EXCLUDE
|
||||||
REGEX "d\\." EXCLUDE
|
REGEX "d\\." EXCLUDE
|
||||||
|
REGEX "_debug\\." EXCLUDE
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
# qtconf
|
# qtconf
|
||||||
INSTALL(
|
INSTALL(
|
||||||
@ -540,7 +560,7 @@ INSTALL(
|
|||||||
FILE(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
|
FILE(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
|
||||||
function(gp_resolved_file_type_override resolved_file type_var)
|
function(gp_resolved_file_type_override resolved_file type_var)
|
||||||
if(resolved_file MATCHES \"^/usr/lib/libQt\")
|
if(resolved_file MATCHES \"^/usr/lib/libQt\")
|
||||||
message(\"resolving \${resolved_file} as system\")
|
message(\"resolving \${resolved_file} as other\")
|
||||||
set(\${type_var} other PARENT_SCOPE)
|
set(\${type_var} other PARENT_SCOPE)
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
Loading…
Reference in New Issue
Block a user