fix: set Ninja "Multi-Config" as default

Author: abeimler

Dockerfile

@@ -110,7 +110,7 @@ ENV TOOLCHAIN_FILE "$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 # build script settings
 ENV TARGET "all"
 ENV BUILD_TYPE "Release"
-ENV CMAKE_GENERATOR "Ninja"
+ENV CMAKE_GENERATOR "Ninja Multi-Config"
 ENV CMAKE_ARGS ""
 
 # setup project env

Dockerfile.android

@@ -9,7 +9,7 @@ ARG vcpkg_target_triplet="arm-android"
 ARG android_abi="armeabi-v7a"
 
 ARG cmake="android-${android_abi}-cmake"
-ARG cmake_generator="Ninja"
+ARG cmake_generator="Ninja Multi-Config"
 ARG make="ninja"
 ARG cc="clang"
 ARG cxx="clang++"

Dockerfile.android-v

@@ -11,7 +11,7 @@ ARG android_target="30"
 ARG android_ndk_version=""
 
 ARG cmake="android-${android_abi}-cmake"
-ARG cmake_generator="Ninja"
+ARG cmake_generator="Ninja Multi-Config"
 ARG make="ninja"
 ARG cc="clang"
 ARG cxx="clang++"

Dockerfile.ci

@@ -112,7 +112,7 @@ ENV TOOLCHAIN_FILE "$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 # build script settings
 ENV TARGET "all"
 ENV BUILD_TYPE "Release"
-ENV CMAKE_GENERATOR "Ninja"
+ENV CMAKE_GENERATOR "Ninja Multi-Config"
 ENV CMAKE_ARGS ""
 
 # setup project env

Dockerfile.ci-setup-cpp

@@ -130,7 +130,7 @@ ENV VCPKG_TOOLCHAIN_FILE "$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 # build script settings
 ENV TARGET "all"
 ENV BUILD_TYPE "Release"
-ENV CMAKE_GENERATOR "Ninja"
+ENV CMAKE_GENERATOR "Ninja Multi-Config"
 ENV VCPKG_TOOLCHAIN_FILE "/root/vcpkg/scripts/buildsystems/vcpkg.cmake"
 ENV TOOLCHAIN_FILE "/root/vcpkg/scripts/buildsystems/vcpkg.cmake"
 ENV CMAKE_ARGS ""

Dockerfile.ci-windows

@@ -99,7 +99,7 @@ ARG cc="x86_64-w64-mingw32-gcc"
 ARG cxx="x86_64-w64-mingw32-g++"
 ARG cmake="cmake"
 ARG make="ninja"
-ARG cmake_generator="Ninja"
+ARG cmake_generator="Ninja Multi-Config"
 ARG cmake_toolchain_file="/home/cmake/x86_64-w64-mingw32.toolchain.cmake"
 ARG cross_root "/usr/x86_64-w64-mingw32"
 

Dockerfile.clang

@@ -32,7 +32,7 @@ ENV TOOLCHAIN_FILE "$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 # build script settings
 ENV TARGET "all"
 ENV BUILD_TYPE "Release"
-ENV CMAKE_GENERATOR "Ninja"
+ENV CMAKE_GENERATOR "Ninja Multi-Config"
 ENV CMAKE_ARGS ""
 
 # setup project env

Dockerfile.cross-rpi

@@ -19,7 +19,7 @@ ARG cross_cmake="${cross_triple}-cmake"
 ARG cross_make="${cross_triple}-make"
 ARG cross_root="/usr/$cross_triple"
 ARG cmake_toolchain_file
-ARG cmake_generator="Unix Makefiles"
+ARG cmake_generator="Ninja Multi-Config"
 
 # e.g. mingw-w64-toolchain
 ARG install_toolchain="${cross_triple}-gcc" 

Dockerfile.crosstool-ng

@@ -10,7 +10,7 @@ ARG vcpkg_target_triplet
 ARG cross_triple
 ARG cmake="cmake"
 ARG make="ninja"
-ARG cmake_generator="Ninja"
+ARG cmake_generator="Ninja Multi-Config"
 ARG cmake_toolchain_file
 
 # Install packages available from standard repos

Dockerfile.crosstool-ng-rpi

@@ -10,7 +10,7 @@ ARG vcpkg_target_triplet="arm-linux"
 ARG cross_triple="armv8-rpi4-linux-gnueabihf"
 ARG cmake="cmake"
 ARG make="ninja"
-ARG cmake_generator="Ninja"
+ARG cmake_generator="Ninja Multi-Config"
 ARG cmake_toolchain_file="/home/cmake/rpi-toolchain.cmake"
 
 # Install packages available from standard repos

Dockerfile.emscripten

@@ -14,7 +14,7 @@ ARG cross_make="emmake make"
 ARG cmake="cmake"
 ARG make="make"
 ARG cmake_toolchain_file="/usr/lib/emscripten/cmake/Modules/Platform/Emscripten.cmake"
-ARG cmake_generator="Unix Makefiles"
+ARG cmake_generator="Ninja Multi-Config"
 
 
 # Install packages available from standard repos

Dockerfile.gcc

@@ -46,7 +46,7 @@ ENV TOOLCHAIN_FILE "$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 # build script settings
 ENV TARGET "all"
 ENV BUILD_TYPE "Release"
-ENV CMAKE_GENERATOR "Unix Makefiles"
+ENV CMAKE_GENERATOR "Ninja Multi-Config"
 ENV CMAKE_ARGS ""
 
 # setup project env

Dockerfile.mxe

@@ -13,7 +13,7 @@ ARG cc="${cross_triplet}-gcc"
 ARG cxx="${cross_triplet}-g++"
 ARG cmake="${cross_triplet}-cmake"
 ARG make="make"
-ARG cmake_generator="Unix Makefiles"
+ARG cmake_generator="Ninja Multi-Config"
 
 # Install packages available from standard repos
 RUN pacman-db-upgrade && \

Dockerfile.without-vcpkg

@@ -24,7 +24,7 @@ ENV MAKE "make"
 # build script settings
 ENV TARGET "all"
 ENV BUILD_TYPE "Release"
-ENV CMAKE_GENERATOR "Ninja"
+ENV CMAKE_GENERATOR "Ninja Multi-Config"
 ENV CMAKE_ARGS ""
 
 # setup project env

taskfiles/TaskfileCross.yml

@@ -30,11 +30,10 @@ tasks:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: configure
-      - cd build || exit
-      - {{.CROSS_MAKE}} "{{.TARGET}}"
+      - '{{.CROSS_CMAKE}} --build build --config {{.BUILD_TYPE}} --target "{{.TARGET}}"'
 
   test:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: build
-      - ctest --build-test
+      - ctest --build-test --test-dir build -C {{.BUILD_TYPE}}

taskfiles/TaskfileDefault.yml

@@ -37,10 +37,10 @@ tasks:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: configure
-      - '{{.CMAKE}} --build build --target "{{.TARGET}}"'
+      - '{{.CMAKE}} --build build --config {{.BUILD_TYPE}} --target "{{.TARGET}}"'
 
   test:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: build
-      - ctest --build-test --test-dir build
+      - ctest --build-test --test-dir build -C {{.BUILD_TYPE}}

taskfiles/TaskfileSetupCpp.yml

@@ -23,13 +23,13 @@ tasks:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: configure
-      - '{{.CMAKE}} --build build --target "{{.TARGET}}"'
+      - '{{.CMAKE}} --build build --config {{.BUILD_TYPE}} --target "{{.TARGET}}"'
 
   test:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: build
-      - ctest --build-test --test-dir build
+      - ctest --build-test --test-dir build -C {{.BUILD_TYPE}} 
 
   coverage:
     dir: '{{.PROJECT_DIR}}'

taskfiles/TaskfileSetupCppCross.yml

@@ -27,14 +27,13 @@ tasks:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: configure
-      - cd build || exit 
-      - {{.CROSS_MAKE}} "{{.TARGET}}"
+      - '{{.CMAKE}} --build build --config {{.BUILD_TYPE}} --target "{{.TARGET}}"'
 
   test:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: build
-      - ctest --build-test --test-dir build
+      - ctest --build-test --test-dir build -C {{.BUILD_TYPE}}
 
   coverage:
     dir: '{{.PROJECT_DIR}}'

taskfiles/TaskfileWithoutVcpkgToolchain.yml

@@ -21,10 +21,10 @@ tasks:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: configure
-      - '{{.CMAKE}} --build build --target "{{.TARGET}}"'
+      - '{{.CMAKE}} --build build --config {{.BUILD_TYPE}} --target "{{.TARGET}}"'
 
   test:
     dir: '{{.PROJECT_DIR}}'
     cmds:
       - task: build
-      - ctest --build-test --test-dir build
+      - ctest --build-test --test-dir build -C {{.BUILD_TYPE}}

taskfiles/docker/Build.yml

@@ -35,7 +35,7 @@ tasks:
         --build-arg cross_triple="x86_64-w64-mingw32" \
         --build-arg install_toolchain="mingw-w64-toolchain" \
         --build-arg install_extras_toolchain="mingw-w64-pkg-config mingw-w64-cmake mingw-w64-configure mingw-w64-make mingw-w64-environment powershell-bin" \
-        --build-arg cmake_generator="Ninja" \
+        --build-arg cmake_generator="Ninja Multi-Config" \
         --build-arg make="make" \
         --build-arg cmake="cmake" \
         --build-arg cross_make="x86_64-w64-mingw32-make" \
@@ -53,7 +53,7 @@ tasks:
         --build-arg cross_triple="i686-w64-mingw32" \
         --build-arg install_toolchain="mingw-w64-toolchain" \
         --build-arg install_extras_toolchain="mingw-w64-pkg-config mingw-w64-cmake mingw-w64-configure mingw-w64-make mingw-w64-environment powershell-bin" \
-        --build-arg cmake_generator="Ninja" \
+        --build-arg cmake_generator="Ninja Multi-Config" \
         --build-arg make="make" \
         --build-arg cmake="cmake" \
         --build-arg cross_make="i686-w64-mingw32-make" \
@@ -73,7 +73,7 @@ tasks:
         --build-arg vcpkg_target_triplet="arm64-linux" \
         --build-arg cross_triple="aarch64-linux-gnu" \
         --build-arg install_toolchain="aarch64-linux-gnu-gcc" \
-        --build-arg cmake_generator="Ninja" \
+        --build-arg cmake_generator="Ninja Multi-Config" \
         --build-arg make="ninja" \
         --build-arg cmake="cmake" \
         --build-arg cross_make="ninja" \
@@ -85,7 +85,7 @@ tasks:
         --build-arg vcpkg_target_triplet="arm-linux" \
         --build-arg cross_triple="arm-none-eabi" \
         --build-arg install_toolchain="arm-none-eabi-gcc" \
-        --build-arg cmake_generator="Ninja" \
+        --build-arg cmake_generator="Ninja Multi-Config" \
         --build-arg make="ninja" \
         --build-arg cmake="cmake" \
         --build-arg cross_make="ninja" \
@@ -98,7 +98,7 @@ tasks:
     #    --build-arg vcpkg_target_triplet="arm-linux" \
     #    --build-arg cross_triple="arm-linux-gnueabihf" \
     #    --build-arg install_toolchain="arm-linux-gnueabihf-gcc-stage1 arm-linux-gnueabihf-gcc-stage2 arm-linux-gnueabihf-gcc" \
-    #    --build-arg cmake_generator="Ninja" \
+    #    --build-arg cmake_generator="Ninja Multi-Config" \
     #    --build-arg make="ninja" \
     #    --build-arg cmake="cmake" \
     #    --build-arg cmake_toolchain_file="/home/cmake/arm.toolchain.cmake" \
@@ -137,7 +137,7 @@ tasks:
         --build-arg vcpkg_target_triplet="arm64-linux" \
         --build-arg cross_triple="aarch64-linux-gnu" \
         --build-arg install_toolchain="aarch64-linux-gnu-gcc" \
-        --build-arg cmake_generator="Ninja" \
+        --build-arg cmake_generator="Ninja Multi-Config" \
         --build-arg make="ninja" \
         --build-arg cmake="cmake" \
         --build-arg cross_make="ninja" \

taskfiles/docker/Test.yml

@@ -37,7 +37,7 @@ tasks:
     - container-structure-test test --image abeimler/simple-cppbuilder:gcc-10 --config tests/gcc10-test.yaml
     - container-structure-test test --image abeimler/simple-cppbuilder:gcc-9 --config tests/gcc9-test.yaml
 
-  base:run:
+  base:example:
     - docker-compose -f examples/example/docker-compose.yml up --build example-gcc-debug-build
     - docker-compose -f examples/example/docker-compose.yml up --build example-gcc-debug-build-make
     - docker-compose -f examples/example/docker-compose.yml up --build example-gcc-debug-test
@@ -47,22 +47,22 @@ tasks:
     - docker-compose -f examples/example/docker-compose.yml up --build example-gcc-debug-test-lcov
     - docker-compose -f examples/example/docker-compose.yml down --volumes --rmi local
 
-  clang:run:
+  clang:example:
     - docker-compose -f examples/example/docker-compose.yml up --build example-clang-debug-build
     - docker-compose -f examples/example/docker-compose.yml up --build example-clang-debug-test
     - docker-compose -f examples/example/docker-compose.yml up --build example-clang-release-build
     - docker-compose -f examples/example/docker-compose.yml up --build example-clang-release-test
     - docker-compose -f examples/example/docker-compose.yml down --volumes --rmi local
 
-  cpp_starter_project:run:
+  cpp_starter_project:example:
     - docker-compose -f examples/cpp_starter_project/docker-compose.yml up --build cpp_starter_project-gcc-debug-build cpp_starter_project-gcc-debug-test
     - docker-compose -f examples/cpp_starter_project/docker-compose.yml up --build cpp_starter_project-clang-debug-build cpp_starter_project-clang-release-build
     - docker-compose -f examples/cpp_starter_project/docker-compose.yml up --build cpp_starter_project-gcc-debug-test-cov
     - docker-compose -f examples/cpp_starter_project/docker-compose.yml up --build cpp_starter_project-fltk-clang-release-build
     - docker-compose -f examples/cpp_starter_project/docker-compose.yml up --build cpp_starter_project-gtkmm-clang-release-build
     - docker-compose -f examples/cpp_starter_project/docker-compose.yml down --volumes --rmi local
 
-  ci:run:
+  ci:example:
     - docker-compose -f examples/example-ci/docker-compose.yml up --build example-gcc-build
     - docker-compose -f examples/example-ci/docker-compose.yml up --build example-gcc-test
     - docker-compose -f examples/example-ci/docker-compose.yml up --build example-gcc-test-cov
@@ -75,23 +75,23 @@ tasks:
   single:old-build-script:
     - docker run -it --rm --name my-cpp-project -v "$PWD/examples/single":/home/project -w /home/project abeimler/simple-cppbuilder ./docker-build.sh
 
-  emscripten:run-example:
+  emscripten:example:
     - docker-compose -f examples/web-example/docker-compose.yml up --build
     - docker-compose -f examples/web-example/docker-compose.yml down --volumes --rmi local
 
-  mingw:run-example:
+  mingw:example:
     - docker-compose -f examples/example/docker-compose.cross.yml up --build example-mingw-release-build
     - docker-compose -f examples/example/docker-compose.cross.yml down --volumes --rmi local
 
-  android:run-example:
+  android:example:
     - docker-compose -f examples/android-example/docker-compose.yml up --build
     - docker-compose -f examples/android-example/docker-compose.yml down --volumes --rmi local
 
-  arm:rpi:run-example:
+  arm:rpi:example:
     - docker-compose -f examples/example/docker-compose.cross.yml up --build example-arm64-release-build
     - docker-compose -f examples/example/docker-compose.cross.yml down --volumes --rmi local
 
-  rpi:run-example:
+  rpi:example:
     - docker-compose -f examples/example/docker-compose.cross.yml up --build example-rpi4-release-build
     - docker-compose -f examples/example/docker-compose.cross.yml down --volumes --rmi local
 

tests/base-test.yaml

@@ -2,18 +2,18 @@ schemaVersion: 2.0.0
 
 commandTests:
 - name: gcc compiler
-  command: $CC
+  command: gcc
   args: ["--version"]
   expectedOutput: [".*gcc.*GCC.*"]
 - name: g++ compiler
-  command: $CXX
+  command: g++
   args: ["--version"]
   expectedOutput: [".*g\\+\\+.*GCC.*"]
 - name: cmake
-  command: $CMAKE
+  command: cmake
   args: ["--version"]
   expectedOutput: [".*cmake version.*"]
 - name: make
-  command: $MAKE
+  command: make
   args: ["--version"]
   expectedOutput: [".*GNU Make.*"]