Details
-
Bug
-
Resolution: Done
-
P2: Important
-
6.2.5
-
None
-
-
a29af6656f (qt/qtbase/dev) a29af6656f (qt/tqtc-qtbase/dev) c1b63ba124 (qt/tqtc-qtbase/6.2) 25ba921d50 (qt/qtbase/6.4) 25ba921d50 (qt/tqtc-qtbase/6.4) d448a0a611 (qt/qtbase/6.3) d448a0a611 (qt/tqtc-qtbase/6.3)
Description
Using -system-doubleconversion fails the build because the include dir is set to
path-to-double-conversion/include/double-conversion
But qdoublescanprint_p.h looks for :
# include <double-conversion/double-conversion.h>
In file included from /foobar/source-lts/qtbase/src/corelib/text/qlocale_tools.cpp:42: /foobar/source-lts/qtbase/src/corelib/text/qdoublescanprint_p.h:151:14: fatal error: double-conversion/double-conversion.h: No such file or directory 151 | # include <double-conversion/double-conversion.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [qtbase/src/corelib/CMakeFiles/Core.dir/build.make:1733: qtbase/src/corelib/CMakeFiles/Core.dir/text/qlocale_tools.cpp.o] Error 1
https://github.com/qt/qtbase/blob/dev/cmake/FindWrapSystemDoubleConversion.cmake#L32-L37
This should be changed :
find_path(DOUBLE_CONVERSION_INCLUDE_DIR NAMES double-conversion.h PATH_SUFFIXES double-conversion )
To following:
find_path(DOUBLE_CONVERSION_INCLUDE_DIR NAMES double-conversion/double-conversion.h )
Attachments
For Gerrit Dashboard: QTBUG-105501 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
425897,4 | CMake: Fix detection of system double-conversion | dev | qt/qtbase | Status: MERGED | +2 | 0 |
425973,2 | CMake: Fix detection of system double-conversion | 6.4 | qt/qtbase | Status: MERGED | +2 | 0 |
425974,2 | CMake: Fix detection of system double-conversion | 6.3 | qt/qtbase | Status: MERGED | +2 | 0 |
426023,2 | CMake: Fix detection of system double-conversion | tqtc/lts-6.2 | qt/tqtc-qtbase | Status: MERGED | +2 | 0 |