diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-21 15:52:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 07:33:07 +0100 |
| commit | 729a73a9cfe774cb49251be8c99ba5b26d516e01 (patch) | |
| tree | 10c4014477783a1465a4723435fd6ef9bb87d540 /cmake | |
| parent | b04d087bd02f094874726629773a12ed3c1bff5e (diff) | |
CMake: Remove old 3rdparty mechanism for double conversion
Change-Id: I2b20d4d9d95a1f7f59bc506046a1ebc20eb305f7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindWrapDoubleConversion.cmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmake/FindWrapDoubleConversion.cmake b/cmake/FindWrapDoubleConversion.cmake index 9c804a3eec..ed5c394ade 100644 --- a/cmake/FindWrapDoubleConversion.cmake +++ b/cmake/FindWrapDoubleConversion.cmake @@ -5,12 +5,11 @@ if(TARGET WrapDoubleConversion::WrapDoubleConversion) return() endif() -add_library(WrapDoubleConversion::WrapDoubleConversion INTERFACE IMPORTED) - find_package(double-conversion) if (double-conversion_FOUND) include(FeatureSummary) set_package_properties(double-conversion PROPERTIES TYPE REQUIRED) + add_library(WrapDoubleConversion::WrapDoubleConversion INTERFACE IMPORTED) target_link_libraries(WrapDoubleConversion::WrapDoubleConversion INTERFACE double-conversion::double-conversion) set(WrapDoubleConversion_FOUND 1) @@ -44,18 +43,11 @@ int main(int argc, char *argv[]) { return 0; }" HAVE_SPRINTF_L) -# In a static build, we need to find the package to bring the target into scope. -find_package(QtDoubleConversion QUIET) - if (HAVE__SPRINTF_L OR HAVE_SPRINTF_L) + add_library(WrapDoubleConversion::WrapDoubleConversion INTERFACE IMPORTED) target_compile_definitions(WrapDoubleConversion::WrapDoubleConversion INTERFACE QT_NO_DOUBLECONVERSION) set(WrapDoubleConversion_FOUND 1) -elseif(TARGET QtDoubleConversion) - # If a Config package wasn't found, and the C++ library doesn't contain the necessary functions, - # use the library bundled with Qt. - target_link_libraries(WrapDoubleConversion::WrapDoubleConversion INTERFACE QtDoubleConversion) - set(WrapDoubleConversion_FOUND 1) else() set(WrapDoubleConversion_FOUND 0) endif() |