From: Michael Wagner Date: Wed, 24 Mar 2021 15:40:43 +0000 (+0100) Subject: cpp-d1064d X-Git-Tag: mbuild_1.1-2 X-Git-Url: http://wagnertech.de/git?p=projects.git;a=commitdiff_plain;h=4cbfe81620acffe50c3fec1639864a15aaa04588 cpp-d1064d --- diff --git a/tools/make/mconfigure b/tools/make/mconfigure index adea0e3..81b50df 100755 --- a/tools/make/mconfigure +++ b/tools/make/mconfigure @@ -25,13 +25,14 @@ function cmake_check { exit 2 fi - cp debian/$paket.cmake CMakeLists.txt - if [ -n "$cross" ] then # inject cross toolset - echo "set (CMAKE_MODULE_PATH $cross)" >> CMakeLists.txt + echo "set (CMAKE_MODULE_PATH $cross)" > CMakeLists.txt echo "include(toolset)" >> CMakeLists.txt + cat debian/$paket.cmake >> CMakeLists.txt + else + cp debian/$paket.cmake CMakeLists.txt fi echo "make" > debian/$paket.build