A bit more generic CMake setup

Also build with Xcode generator on CI on OS X for testing purposes.

Author: polytypic

commands/setup

@@ -43,33 +43,51 @@ cmake-help-contains() {
 
 # Generate ---------------------------------------------------------------------
 
+GENERATE_CMD=(cmake "-Werror=dev" "-Werror=deprecated")
 BUILD_DIR=".build"
 
-CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}"
+# Compiler
 
-GENERATE_CMD=(cmake "-Werror=dev" "-Werror=deprecated")
-if ! cmake-help-contains "Visual Studio" || [ -n "$CXX" ]; then
-  COVERAGE="${COVERAGE:-0}"
-  if [ "$COVERAGE" = 1 ]; then
-    BUILD_DIR="$BUILD_DIR.coverage"
-    GENERATE_CMD+=("-DCOVERAGE=ON")
-  fi
+if [ -n "$CXX" ]; then
+  BUILD_DIR="$BUILD_DIR.$CXX"
+fi
 
-  BUILD_DIR="$BUILD_DIR.$CMAKE_BUILD_TYPE${CXX:+.}$CXX"
-  GENERATE_CMD+=("-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE")
+# Generator
 
-  if cmake-help-contains "MSYS Makefiles" && [ -z "$CMAKE_GENERATOR" ] ; then
-    export CMAKE_GENERATOR="MSYS Makefiles"
-  fi
+if [ -n "$CXX" ] && [ -z "$CMAKE_GENERATOR" ] \
+     && cmake-help-contains "MSYS Makefiles"; then
+  export CMAKE_GENERATOR="MSYS Makefiles"
 fi
+
+if [ "$CMAKE_GENERATOR" = "MSYS Makefiles" ]; then
+  export CMAKE_MAKE_PROGRAM="make"
+fi
+
 if [ -n "$CMAKE_GENERATOR" ]; then
   BUILD_DIR="$BUILD_DIR.${CMAKE_GENERATOR// /_}"
   GENERATE_CMD+=("-G" "$CMAKE_GENERATOR")
+fi
 
-  if [ "$CMAKE_GENERATOR" = "MSYS Makefiles" ]; then
-    export CMAKE_MAKE_PROGRAM="make"
-  fi
+# Build type
+
+CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}"
+
+if [[ "$CMAKE_GENERATOR" =~ Makefiles|Ninja ]] || \
+     ([ -z "$CMAKE_GENERATOR" ] && ! cmake-help-contains 'Visual Studio'); then
+  BUILD_DIR="$BUILD_DIR.$CMAKE_BUILD_TYPE"
+  GENERATE_CMD+=("-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE")
 fi
+
+# Coverage
+
+COVERAGE="${COVERAGE:-0}"
+if [ "$COVERAGE" = 1 ]; then
+  BUILD_DIR="$BUILD_DIR.coverage"
+  GENERATE_CMD+=("-DCOVERAGE=ON")
+fi
+
+# Finish
+
 GENERATE_CMD+=(..)
 
 # Clean
@@ -100,7 +118,10 @@ fi
 BUILD_CMD+=(cmake --build . --config "$CMAKE_BUILD_TYPE" --parallel "$N_PARALLEL_BUILD" --)
 TEST_CMD+=(ctest --build-config "$CMAKE_BUILD_TYPE" --parallel "$N_PARALLEL_TEST")
 
-if cmake-help-contains "Visual Studio" && [ -z "$CXX" ]; then
+# Quiet
+
+if [[ "$CMAKE_GENERATOR" =~ 'Visual Studio' ]] || \
+     ([ -z "$CMAKE_GENERATOR" ] && cmake-help-contains "Visual Studio"); then
   if [ "$QUIET" != 0 ]; then
     MSBUILD_VERBOSITY="${MSBUILD_VERBOSITY:-QUIET}"
   fi
@@ -109,6 +130,15 @@ if cmake-help-contains "Visual Studio" && [ -z "$CXX" ]; then
   fi
 fi
 
+if [[ "$CMAKE_GENERATOR" =~ Xcode ]]; then
+  if [ "$QUIET" != 0 ]; then
+    XCODE_VERBOSITY="${XCODE_VERBOSITY:-quiet}"
+  fi
+  if [ -n "$XCODE_VERBOSITY" ]; then
+    BUILD_CMD+=("-$XCODE_VERBOSITY")
+  fi
+fi
+
 # Watch ------------------------------------------------------------------------
 
 export WATCH_CMD=(fswatch --one-per-batch --recursive)

travis-ci

@@ -82,19 +82,18 @@ fi
 folded ... finish GIT_UPDATE_PID
 
 for CONFIG in Debug Release; do
-  export CMAKE_BUILD_TYPE=$CONFIG
   if [ "$TRAVIS_OS_NAME" = linux ]; then
     folded ... finish LIBSTD_INSTALL_PID
-    CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
     folded ... finish GCC_INSTALL_PID
-    CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
   elif [ "$TRAVIS_OS_NAME" = windows ]; then
-    CC='' CXX='' folded "VC2017 $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' folded "VC2017 $CONFIG" cppsm test
     folded ... finish MAKE_INSTALL_PID
-    CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
   elif [ "$TRAVIS_OS_NAME" = osx ]; then
-    CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
-    CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR=Xcode folded "Clang $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
   else
     echo "Unsupported OS: $TRAVIS_OS_NAME"
     exit 1
@@ -106,8 +105,7 @@ if [ "$TRAVIS_OS_NAME" = windows ]; then
   folded ... choco upgrade -y cmake.install
 
   for CONFIG in Debug Release; do
-    export CMAKE_BUILD_TYPE=$CONFIG
-    CC='' CXX='' CMAKE_GENERATOR="Visual Studio 16 2019" folded "VC2019 $CONFIG" cppsm test
+    CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR="Visual Studio 16 2019" folded "VC2019 $CONFIG" cppsm test
   done
 fi