diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-26 16:33:26 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-29 12:47:53 +0200 |
| commit | 8df4caf554e81e7de9e0154a15544426e99acbbc (patch) | |
| tree | 4a7b2e6e4fb1d2b9f7850272b20c301f0ae20d6a /cmake | |
| parent | 5ccecd3a898565fbf2115acd9f721b949dbc8fcc (diff) | |
CMake: Allow to pass a custom target mkspec name
It's now possible to pass -DQT_QMAKE_TARGET_MKSPEC=foo to cmake. If the
value is not passed, then we will guess the mkspec like we did before.
Change-Id: If6e8324654cb8bd83d3cba9eb6ee1e4ad2692a2c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index a520bb6c3b..daa98d9498 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -253,18 +253,17 @@ endfunction() qt_setup_tool_path_command() # Platform define path, etc. -set(QT_QMAKE_TARGET_MKSPEC "") if(WIN32) set(QT_DEFAULT_PLATFORM_DEFINITIONS UNICODE _UNICODE WIN32 _ENABLE_EXTENDED_ALIGNED_STORAGE) if(CMAKE_SIZEOF_VOID_P EQUAL 8) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64) endif() if(MSVC) - set(QT_QMAKE_TARGET_MKSPEC win32-msvc) + set(QT_DEFAULT_MKSPEC win32-msvc) elseif(CLANG AND MINGW) - set(QT_QMAKE_TARGET_MKSPEC win32-clang-g++) + set(QT_DEFAULT_MKSPEC win32-clang-g++) elseif(MINGW) - set(QT_QMAKE_TARGET_MKSPEC win32-g++) + set(QT_DEFAULT_MKSPEC win32-g++) endif() if (MINGW) @@ -272,27 +271,31 @@ if(WIN32) endif() elseif(LINUX) if(GCC) - set(QT_QMAKE_TARGET_MKSPEC linux-g++) + set(QT_DEFAULT_MKSPEC linux-g++) elseif(CLANG) - set(QT_QMAKE_TARGET_MKSPEC linux-clang) + set(QT_DEFAULT_MKSPEC linux-clang) elseif(ICC) - set(QT_QMAKE_TARGET_MKSPEC linux-icc-64) + set(QT_DEFAULT_MKSPEC linux-icc-64) endif() elseif(ANDROID) if(GCC) - set(QT_QMAKE_TARGET_MKSPEC android-g++) + set(QT_DEFAULT_MKSPEC android-g++) elseif(CLANG) - set(QT_QMAKE_TARGET_MKSPEC android-clang) + set(QT_DEFAULT_MKSPEC android-clang) endif() elseif(APPLE) - set(QT_QMAKE_TARGET_MKSPEC macx-clang) + set(QT_DEFAULT_MKSPEC macx-clang) if(MACOS) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS GL_SILENCE_DEPRECATION) elseif(UIKIT) list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS GLES_SILENCE_DEPRECATION) endif() elseif(EMSCRIPTEN) - set(QT_QMAKE_TARGET_MKSPEC wasm-emscripten) + set(QT_DEFAULT_MKSPEC wasm-emscripten) +endif() + +if(NOT QT_QMAKE_TARGET_MKSPEC) + set(QT_QMAKE_TARGET_MKSPEC "${QT_DEFAULT_MKSPEC}" CACHE STRING "QMake target mkspec") endif() if(CMAKE_CROSSCOMPILING) |