Small tidy-ups and extension to the CI testing

Author: NWilson

.github/workflows/build.yml

@@ -125,21 +125,31 @@ jobs:
         run: |
           INSTALL_PREFIX=`pwd`/build/install-dir
           cd maint/cmake-tests/install-interface
-          cmake -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" -B build
-          cd build
-          make
-          ./test_executable
+
+          for useStaticLibs in ON OFF; do
+            echo "== Testing CMake install interface with PCRE2_USE_STATIC_LIBS=$useStaticLibs =="
+            rm -rf build
+            cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" -DPCRE2_USE_STATIC_LIBS=$useStaticLibs -B build
+            (cd build; make)
+            ./build/test_executable
+          done
 
       - name: Test CMake build interface
         run: |
           BUILD_DIR=`pwd`
           cp -rp maint/cmake-tests/build-interface ../cmake-tests-build-interface
           cd ../cmake-tests-build-interface
           ln -s "$BUILD_DIR" pcre2
-          cmake -B build
-          cd build
-          make
-          ./test_executable
+
+          for buildLibs in "ON;OFF" "OFF;ON"; do
+            static=$(echo $buildLibs | cut -d';' -f1)
+            shared=$(echo $buildLibs | cut -d';' -f2)
+            echo "== Testing CMake build interface with BUILD_STATIC_LIBS=$static and BUILD_SHARED_LIBS=$shared =="
+            rm -rf build
+            cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_STATIC_LIBS=$static -DBUILD_SHARED_LIBS=$shared -B build
+            (cd build; make)
+            ./build/test_executable
+          done
 
   windows:
     name: Windows
@@ -174,19 +184,29 @@ jobs:
         run: |
           $INSTALL_PREFIX = (pwd).Path + "\build\install-dir"
           cd maint/cmake-tests/install-interface
-          cmake -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" -B build -A ${{ matrix.arch }}
-          cmake --build build --config Release
-          ./build/Release/test_executable.exe
+
+          foreach ($useStaticLibs in @("ON", "OFF")) {
+            echo "== Testing CMake install interface with PCRE2_USE_STATIC_LIBS=$useStaticLibs =="
+            rm -Recurse -Force build
+            cmake -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" -DPCRE2_USE_STATIC_LIBS=$useStaticLibs -B build -A ${{ matrix.arch }}
+            cmake --build build --config Release
+            ./build/Release/test_executable.exe
+          }
 
       - name: Test CMake build interface
         run: |
           $BUILD_DIR = (pwd).Path
           cp -Recurse -Path maint/cmake-tests/build-interface ../cmake-tests-build-interface
           cd ../cmake-tests-build-interface
           New-Item -ItemType SymbolicLink -Path "pcre2" -Target "$BUILD_DIR"
-          cmake -B build -A ${{ matrix.arch }}
-          cmake --build build --config Debug
-          ./build/Debug/test_executable.exe
+
+          foreach ($buildLibs in @(@{static="ON"; shared="OFF"}, @{static="OFF"; shared="ON"})) {
+            echo "== Testing CMake build interface with BUILD_STATIC_LIBS=$($buildLibs.static) =="
+            rm -Recurse -Force build
+            cmake -DBUILD_STATIC_LIBS=$($buildLibs.static) -DBUILD_SHARED_LIBS=$($buildLibs.shared) -B build -A ${{ matrix.arch }}
+            cmake --build build --config Debug
+            ./build/Debug/test_executable.exe
+          }
 
   freebsd:
     name: FreeBSD

.github/workflows/dev.yml

@@ -200,11 +200,39 @@ jobs:
         run: |
           cd build
           cmake --install . --prefix install-dir
-          # Slight hack to trick RunManifestTest to pass with MinSizeRel.
-          mv install-dir/lib/cmake/pcre2/pcre2-targets-minsizerel.cmake install-dir/lib/cmake/pcre2/pcre2-targets-release.cmake
-          ../maint/RunManifestTest install-dir ../maint/manifest-cmakeinstall-linux
+          ../maint/RunManifestTest install-dir ../maint/manifest-cmakeinstall-linux minsizerel
           ../maint/RunSymbolTest install-dir/lib/ ../maint/
 
+      - name: Test CMake install interface
+        run: |
+          INSTALL_PREFIX=`pwd`/build/install-dir
+          cd maint/cmake-tests/install-interface
+
+          for useStaticLibs in ON OFF; do
+            echo "== Testing CMake install interface with PCRE2_USE_STATIC_LIBS=$useStaticLibs =="
+            rm -rf build
+            cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" -DPCRE2_USE_STATIC_LIBS=$useStaticLibs -B build
+            (cd build; make)
+            ./build/test_executable
+          done
+
+      - name: Test CMake build interface
+        run: |
+          BUILD_DIR=`pwd`
+          cp -rp maint/cmake-tests/build-interface ../cmake-tests-build-interface
+          cd ../cmake-tests-build-interface
+          ln -s "$BUILD_DIR" pcre2
+
+          for buildLibs in "ON;OFF" "OFF;ON"; do
+            static=$(echo $buildLibs | cut -d';' -f1)
+            shared=$(echo $buildLibs | cut -d';' -f2)
+            echo "== Testing CMake build interface with BUILD_STATIC_LIBS=$static and BUILD_SHARED_LIBS=$shared =="
+            rm -rf build
+            cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_STATIC_LIBS=$static -DBUILD_SHARED_LIBS=$shared -B build
+            (cd build; make)
+            ./build/test_executable
+          done
+
   bat:
     # Tests with: MSVC 32-bit, and a variety of CMake options
     name: Windows (Win32)

maint/RunManifestTest

@@ -9,14 +9,16 @@ LANG=C # Ensure stable ordering of `sort` output
 export LANG
 
 if [ "$1" = "" -o "$2" = "" ] ; then
-  echo "Usage: $0 <dir> <manifest name>" >&2
+  echo "Usage: $0 <dir> <manifest name> [<build type>]" >&2
   exit 1
 fi
 
 input_dir="$1"
 expected_manifest="$2"
+build_type="${3:-release}"
 
-base=`basename $expected_manifest`
+actual_file=`basename $expected_manifest`.actual
+expected_file=`basename $expected_manifest`.expected
 
 sed=sed
 # Helper for Solaris
@@ -29,17 +31,24 @@ find "$input_dir" -print | \
   xargs -n1 -- ls -l -d -n | \
   $sed -E -e 's/ {2,}/ /g' | \
   cut -d' ' -f '1,9-' \
-  > "$base"
+  > "$actual_file"
 
-if ! diff -u "$expected_manifest" "$base"; then
+# The CMake install is a bit annoying now. Its installed files are actually
+# dependent on the build type. So, if the build type is not "release", we need
+# to modify the expected manifest to match the actual one. 
+cat "$expected_manifest" | \
+  sed -E -e "s/pcre2-targets-release.cmake/pcre2-targets-$build_type.cmake/" \
+  > "$expected_file"
+
+if ! diff -u "$expected_file" "$actual_file"; then
   echo "Installed files differ from expected"
 
   echo "===Actual==="
-  cat "$base"
+  cat "$actual_file"
   echo "===End==="
 
   exit 1
 fi
 
 echo "Installed files match expected"
-rm -f "$base"
+rm -f "$actual_file" "$expected_file"