diff options
| author | Martin Storsjö <martin@martin.st> | 2020-03-27 23:19:36 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2020-03-30 13:31:05 +0300 |
| commit | 907652e1ed3c95e3fdb1620cec4d5a1034153398 (patch) | |
| tree | 3c2c88892bc2dd6e50ad23e5e422695299037f7b /src/corelib/configure.json | |
| parent | c3a4d3608245c5614fcaf95bbe37f2300bbac4cb (diff) | |
Extend the configure test for C++17 filesystem
If recent versions of libc++ are built with filesystem support disabled,
the filesystem header still is installed., The std::filesystem::path()
constructor is completely defined inline in that header, making the test
pass on such configurations, despite C++17 filesystem not being
implemented.
Test a call to std::filesystem::copy instead, which requires the actual
library implementation to be available as well (on recent libc++).
Change-Id: Id997ab75f3299d8431b13cad871f2901f4d9f6ed
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index a8efaa509c..4225574761 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -371,7 +371,11 @@ "type": "compile", "test": { "include": "filesystem", - "main": "std::filesystem::path p(\"./file\");", + "main": [ + "std::filesystem::copy(", + " std::filesystem::path(\"./file\"),", + " std::filesystem::path(\"./other\"));" + ], "qmake": "CONFIG += c++17" } }, |