cpp-d1064d mbuild_1.1-2
authorMichael Wagner <michael@wagnertech.de>
Wed, 24 Mar 2021 15:40:43 +0000 (16:40 +0100)
committerMichael Wagner <michael@wagnertech.de>
Wed, 24 Mar 2021 15:40:43 +0000 (16:40 +0100)
tools/make/mconfigure

index adea0e3..81b50df 100755 (executable)
@@ -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