From 731ba7036effcc430f98031e7f2a9826f6234cba Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 29 Mar 2018 04:00:27 +0200 Subject: Make use of upstream CMake infrastructure to detect the compiler toolchain 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 --- toolchain/specifydependencies.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'toolchain/specifydependencies.cmake') 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}) -- cgit v1.2.1