diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-12 10:07:57 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-12 09:24:31 +0000 |
| commit | cfba14e1e9198f3b902e267e44b9f57d40920e1d (patch) | |
| tree | 9f83738b345c1bbf84affbea5d582ee2af9e71bd /src/corelib/configure.cmake | |
| parent | 2e64ac90d8b71bf1afe4ae4af87096a3888ff3be (diff) | |
configurejson2cmake.py: Support for the two cases that have LIBS +=
Since there's only two i hardcoded it for the moment instead of trying
to parse the line
Change-Id: I0da578af64ef9621cbbc78bf6ce15bf8a3f63f1c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 3bb08eba8a..227c0a1004 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -114,11 +114,11 @@ int pipes[2]; # cxx11_future if (UNIX) - set(CXX11_FUTURE_TEST_LIBRARIES pthread) + set(cxx11_future_TEST_LIBRARIES pthread) endif() qt_config_compile_test(cxx11_future LABEL "C++11 <future>" - LIBRARIES ${CXX11_FUTURE_TEST_LIBRARIES} + LIBRARIES "${cxx11_future_TEST_LIBRARIES}" CODE " #include <future> @@ -132,8 +132,7 @@ std::future<int> f = std::async([]() { return 42; }); /* END TEST: */ return 0; } -" -) +") # eventfd qt_config_compile_test(eventfd @@ -197,11 +196,11 @@ shmctl(0, 0, (struct shmid_ds *)(0)); # ipc_posix if (LINUX) - set(IPC_POSIX_TEST_LIBRARIES pthread rt) + set(ipc_posix_TEST_LIBRARIES pthread rt) endif() qt_config_compile_test(ipc_posix LABEL "POSIX IPC" - LIBRARIES ${IPC_POSIX_TEST_LIBRARIES} + LIBRARIES "${ipc_posix_TEST_LIBRARIES}" CODE " #include <sys/types.h> @@ -219,8 +218,7 @@ shm_unlink(\"test\"); /* END TEST: */ return 0; } -" -) +") # linkat qt_config_compile_test(linkat |