summaryrefslogtreecommitdiffstats
path: root/src/corelib/CMakeLists.txt
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2021-01-26 13:01:26 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2021-02-03 14:04:50 +0100
commitdca74b45a33de3ec098b936b087a112c7112241b (patch)
tree50c720d1323a2d82913eb5eccbc7352a3edd401f /src/corelib/CMakeLists.txt
parentd136299bb83f5343a62f9e02693f6737981edf62 (diff)
Use the double-conversion sources without rearrangement
This simplifies the include path addition we need when compiling and eliminates the need to rewrite all the #include lines on update. Change-Id: I14e301d277f1eb49286721b012559f0ec84ea520 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/CMakeLists.txt')
-rw-r--r--src/corelib/CMakeLists.txt31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 97aaff3cfe..18eb2451cf 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -747,29 +747,28 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_system_doubleconversion
qt_internal_extend_target(Core CONDITION QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion
SOURCES
+ ../3rdparty/double-conversion/bignum.cc
+ ../3rdparty/double-conversion/bignum-dtoa.cc
+ ../3rdparty/double-conversion/bignum-dtoa.h
+ ../3rdparty/double-conversion/bignum.h
+ ../3rdparty/double-conversion/cached-powers.cc
../3rdparty/double-conversion/cached-powers.h
+ ../3rdparty/double-conversion/diy-fp.h
+ ../3rdparty/double-conversion/double-conversion.h
../3rdparty/double-conversion/double-to-string.cc
- ../3rdparty/double-conversion/ieee.h
+ ../3rdparty/double-conversion/double-to-string.h
../3rdparty/double-conversion/fast-dtoa.cc
- ../3rdparty/double-conversion/diy-fp.h
- ../3rdparty/double-conversion/strtod.h
- ../3rdparty/double-conversion/fixed-dtoa.h
- ../3rdparty/double-conversion/strtod.cc
- ../3rdparty/double-conversion/bignum.h
- ../3rdparty/double-conversion/bignum.cc
- ../3rdparty/double-conversion/cached-powers.cc
- ../3rdparty/double-conversion/bignum-dtoa.cc
../3rdparty/double-conversion/fast-dtoa.h
../3rdparty/double-conversion/fixed-dtoa.cc
+ ../3rdparty/double-conversion/fixed-dtoa.h
+ ../3rdparty/double-conversion/ieee.h
../3rdparty/double-conversion/string-to-double.cc
- ../3rdparty/double-conversion/bignum-dtoa.h
- ../3rdparty/double-conversion/include/double-conversion/utils.h
- ../3rdparty/double-conversion/include/double-conversion/double-to-string.h
- ../3rdparty/double-conversion/include/double-conversion/double-conversion.h
- ../3rdparty/double-conversion/include/double-conversion/string-to-double.h
+ ../3rdparty/double-conversion/string-to-double.h
+ ../3rdparty/double-conversion/strtod.cc
+ ../3rdparty/double-conversion/strtod.h
+ ../3rdparty/double-conversion/utils.h
INCLUDE_DIRECTORIES
- ../3rdparty
- ../3rdparty/double-conversion/include
+ ../3rdparty/double-conversion
)
qt_internal_extend_target(Core CONDITION QT_FEATURE_system_libb2