diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-03-29 04:00:27 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-04-04 18:46:25 +0200 |
| commit | 731ba7036effcc430f98031e7f2a9826f6234cba (patch) | |
| tree | 2fc875aa1046e2b002837d33413a3fb90e4b57b4 /toolchain/specifydependencies.cmake | |
| parent | e75d9234b96aca7edbc828c64d98ac4fd177a520 (diff) | |
| download | extra-cmake-modules-731ba7036effcc430f98031e7f2a9826f6234cba.tar.gz extra-cmake-modules-731ba7036effcc430f98031e7f2a9826f6234cba.tar.bz2 | |
Make use of upstream CMake infrastructure to detect the compiler toolchainv5.45.0-rc1v5.45.0
Summary:
Instead of having ad-hoc code for gcc, let CMake do its thing. It has a lot of
logic that we may be interested in, for example it will make the clang switch
much smoother.
Note it raises the minimum cmake to 3.7 for Android, which was released almost
2 years ago.
Test Plan: Built kalgebra on it using kdeorg/android-sdk
Reviewers: #frameworks, #build_system, vkrause
Reviewed By: vkrause
Subscribers: vkrause
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D11776
Diffstat (limited to 'toolchain/specifydependencies.cmake')
| -rw-r--r-- | toolchain/specifydependencies.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/toolchain/specifydependencies.cmake b/toolchain/specifydependencies.cmake index 8965d6da..a1bc4202 100644 --- a/toolchain/specifydependencies.cmake +++ b/toolchain/specifydependencies.cmake @@ -42,6 +42,9 @@ if(extraplugins) endif() file(READ "${INPUT_FILE}" CONTENTS) +file(READ "stl" stl_contents) + string(REPLACE "##EXTRALIBS##" "${extralibs}" NEWCONTENTS "${CONTENTS}") string(REPLACE "##EXTRAPLUGINS##" "${extraplugins}" NEWCONTENTS "${NEWCONTENTS}") +string(REPLACE "##CMAKE_CXX_STANDARD_LIBRARIES##" "${stl_contents}" NEWCONTENTS "${NEWCONTENTS}") file(WRITE "${OUTPUT_FILE}" ${NEWCONTENTS}) |