summaryrefslogtreecommitdiffstats
path: root/cmake/QtQmakeHelpers.cmake
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2021-10-01 14:07:31 -0700
committerThiago Macieira <thiago.macieira@intel.com>2021-11-04 10:20:09 -0700
commitbcbc36b8bf568409beb8397f603b8f6356d4d611 (patch)
tree21353ac7c3e23276a95e16f68b1bf9bd9a94ae12 /cmake/QtQmakeHelpers.cmake
parent0ab3c5c2505dcfa684fd4a3961f24345de7e1d6f (diff)
CMake/qconfig.cpp: use raw strings so we support any input
Change-Id: I2bbf422288924c198645fffd16aa04379315e69e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtQmakeHelpers.cmake')
-rw-r--r--cmake/QtQmakeHelpers.cmake24
1 files changed, 12 insertions, 12 deletions
diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake
index 9ad84da5ee..3fb126344d 100644
--- a/cmake/QtQmakeHelpers.cmake
+++ b/cmake/QtQmakeHelpers.cmake
@@ -17,18 +17,18 @@ endfunction()
function(qt_generate_qconfig_cpp in_file out_file)
set(QT_CONFIG_STRS "")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_DOCDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_INCLUDEDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_LIBDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_LIBEXECDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_BINDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_PLUGINSDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_QMLDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_ARCHDATADIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_DATADIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_TRANSLATIONSDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_EXAMPLESDIR}\",\n")
- string(APPEND QT_CONFIG_STRS " \"${INSTALL_TESTSDIR}\"")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_DOCDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_INCLUDEDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_LIBDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_LIBEXECDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_BINDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_PLUGINSDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_QMLDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_ARCHDATADIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_DATADIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_TRANSLATIONSDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_EXAMPLESDIR})qconfig\",\n")
+ string(APPEND QT_CONFIG_STRS " R\"qconfig(${INSTALL_TESTSDIR})qconfig\"")
# Settings path / sysconf dir.
set(QT_SYS_CONF_DIR "${INSTALL_SYSCONFDIR}")