diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-05 12:01:36 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-11 09:59:47 +0100 |
| commit | 504d0c37550931fe606f8b74ea2b5740f0c8539e (patch) | |
| tree | b971931225cf54bd64ac8c7393e2eb8126b319ed /qmake/CMakeLists.txt | |
| parent | b788c87457100dfaa92f77d24f3d7fab4798ab6b (diff) | |
qmake: Delegate prefix deduction to QLibraryInfo
Now, that qmake depends on QtCore, we can just ask QLibraryInfo for the
prefix instead of calculating it from QT_CONFIGURE_RELATIVE_PREFIX_PATH.
Remove that define.
Change-Id: I14be298a9d08abf33299e4cdbac55e91af318397
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake/CMakeLists.txt')
| -rw-r--r-- | qmake/CMakeLists.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 2a46a6f3c8..2eca639576 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -12,14 +12,6 @@ if(NOT QT_FEATURE_qmake) return() endif() -# The QT_CONFIGURE_HOSTBINDIR_TO_*PREFIX_PATH defines are exclusively used by qmake to determine -# the prefix from the location of the qmake executable. In our build of qmake host_prefix is -# always the same as ext_prefix, and we can just use CMAKE_INSTALL_PREFIX for the calculation of -# the relative path between <ext_prefix>/bin and <ext_prefix>. -file(RELATIVE_PATH QT_CONFIGURE_RELATIVE_PREFIX_PATH - "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}" "${CMAKE_INSTALL_PREFIX}" -) - qt_get_tool_target_name(target_name qmake) qt_internal_add_tool(${target_name} TOOLS_TARGET Core # special case @@ -65,7 +57,6 @@ qt_internal_add_tool(${target_name} QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case - QT_CONFIGURE_RELATIVE_PREFIX_PATH="${QT_CONFIGURE_RELATIVE_PREFIX_PATH}" INCLUDE_DIRECTORIES generators generators/mac |