1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for MinGW

Browse Source 
Tested with MinGW 7.3.0 64 from Qt 5.12 installation.
The CMake 3rd party libraries I used from hunter project (with some
package, and target names changes)

Change-Id: Ie89555a6cd8bdb7182f9b2dd2c3c39784c523ead
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Adam 2019-05-03 15:46:02 +02:00
parent 6b2de61bf9
commit 1a92808a78
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/QtBuild.cmake
View File

@ -65,6 +65,9 @@ if(WIN32)
set(QT_DEFAULT_PLATFORM_DEFINITION_DIR mkspecs/win32-msvc) set(QT_DEFAULT_PLATFORM_DEFINITION_DIR mkspecs/win32-msvc)
elseif(CLANG) elseif(CLANG)
set(QT_DEFAULT_PLATFORM_DEFINITION_DIR mkspecs/win32-clang) set(QT_DEFAULT_PLATFORM_DEFINITION_DIR mkspecs/win32-clang)
elseif(MINGW)
set(QT_DEFAULT_PLATFORM_DEFINITION_DIR mkspecs/win32-g++)
list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS _WIN32_WINNT=0x0601)
endif() endif()
elseif(LINUX) elseif(LINUX)
if(GCC) if(GCC)
@ -278,7 +281,7 @@ function(qt_internal_add_link_flags_no_undefined target)
if (GCC OR CLANG) if (GCC OR CLANG)
if(APPLE) if(APPLE)
set(no_undefined_flag "-Wl,-undefined,error") set(no_undefined_flag "-Wl,-undefined,error")
elseif(LINUX) elseif(LINUX OR MINGW)
set(no_undefined_flag "-Wl,--no-undefined") set(no_undefined_flag "-Wl,--no-undefined")
else() else()
message(FATAL_ERROR "Platform linker doesn't support erroring upon encountering undefined symbols. Target:\"${target}\".") message(FATAL_ERROR "Platform linker doesn't support erroring upon encountering undefined symbols. Target:\"${target}\".")
@ -1449,7 +1452,10 @@ endfunction()
macro(qt_find_package) macro(qt_find_package)
# Get the target names we expect to be provided by the package. # Get the target names we expect to be provided by the package.
cmake_parse_arguments(arg "" "" "PROVIDED_TARGETS;COMPONENTS" ${ARGN}) set(options CONFIG NO_MODULE MODULE REQUIRED)
set(oneValueArgs)
set(multiValueArgs PROVIDED_TARGETS COMPONENTS)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
# Get the version if specified. # Get the version if specified.
set(package_version "") set(package_version "")
@ -1464,8 +1470,24 @@ macro(qt_find_package)
list(APPEND arg_UNPARSED_ARGUMENTS "COMPONENTS;${arg_COMPONENTS}") list(APPEND arg_UNPARSED_ARGUMENTS "COMPONENTS;${arg_COMPONENTS}")
endif() endif()
if(NOT (arg_CONFIG OR arg_NO_MODULE OR arg_MODULE))
# Try to find a config package first in quiet mode
set(config_package_arg ${arg_UNPARSED_ARGUMENTS})
list(APPEND config_package_arg "CONFIG;QUIET")
find_package(${config_package_arg})
endif()
# Ensure the options are back in the original unparsed arguments
foreach(opt IN LISTS options)
if(arg_${opt})
list(APPEND arg_UNPARSED_ARGUMENTS ${opt})
endif()
endforeach()
if (NOT ${ARGV0}_FOUND)
# Call original function without our custom arguments. # Call original function without our custom arguments.
find_package(${arg_UNPARSED_ARGUMENTS}) find_package(${arg_UNPARSED_ARGUMENTS})
endif()
if(${ARGV0}_FOUND AND arg_PROVIDED_TARGETS) if(${ARGV0}_FOUND AND arg_PROVIDED_TARGETS)
# If package was found, associate each target with its package name. This will be used # If package was found, associate each target with its package name. This will be used