diff --git a/.github/workflows/cmake-script.yml b/.github/workflows/cmake-script.yml
index 6efcc10b310..dd7bf1b541a 100644
--- a/.github/workflows/cmake-script.yml
+++ b/.github/workflows/cmake-script.yml
@@ -111,7 +111,7 @@ jobs:
       - name: Run ctest script (Windows)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -200,7 +200,7 @@ jobs:
       - name: Run ctest (Linux)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-GCC,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-GCC,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -302,7 +302,7 @@ jobs:
         id: run-ctest
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Clang,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Clang,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -387,7 +387,7 @@ jobs:
       - name: Run ctest (Linux S3)
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-S3,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-S3,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -495,7 +495,7 @@ jobs:
           SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Intel,LOCAL_SUBMIT=ON,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Intel,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: pwsh
         continue-on-error: true
 
@@ -590,7 +590,7 @@ jobs:
           CXX: ${{ steps.setup-fortran.outputs.cxx }}
         run: |
           cd "${{ runner.workspace }}/hdf5"
-          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Intel,LOCAL_SUBMIT=ON,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Intel,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
         shell: bash
         continue-on-error: true
 
@@ -601,3 +601,201 @@ jobs:
           name: intel-ubuntu-log
           path: ${{ runner.workspace }}/hdf5/hdf5.log
           if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+####### clang builds
+  build_and_test_win_clang:
+  # Windows w/ clang + CMake
+  #
+    name: "Windows ClangCL CTest"
+    runs-on: windows-latest
+    steps:
+      - name: Install Dependencies (Windows_clang)
+        run: choco install ninja
+
+      - name: add clang to env
+        uses: KyleMayes/install-llvm-action@v2.0.5
+        id: setup-clang
+        with:
+          env: true
+          version: '18'
+
+      - name: Set file base name (Windows_clang)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+        shell: bash
+
+      # Get files created by release script
+      - name: Get zip-tarball (Windows_clang)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: zip-tarball
+          path: ${{ github.workspace }}
+
+      - name: using powershell
+        shell: pwsh
+        run: Get-Location
+
+      - name: List files for the space (Windows_clang)
+        run: |
+          Get-ChildItem -Path ${{ github.workspace }}
+          Get-ChildItem -Path ${{ runner.workspace }}
+        shell: pwsh
+
+      - name: Uncompress source (Windows_clang)
+        working-directory: ${{ github.workspace }}
+        run: 7z x ${{ steps.set-file-base.outputs.FILE_BASE }}.zip
+        shell: bash
+
+      - name: Copy script files for the space (Windows_clang)
+        run: |
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake -Destination ${{ runner.workspace }}/hdf5/
+          Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake -Destination ${{ runner.workspace }}/hdf5/
+        shell: pwsh
+
+      - name: List files for the hdf5 (Windows_clang)
+        run: |
+          Get-ChildItem -Path ${{ runner.workspace }}/hdf5
+        shell: pwsh
+
+      - name: Create options file (Windows_clang)
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+              set (CTEST_DROP_SITE_INIT "my.cdash.org")
+              # Change following line to submit to your CDash dashboard to a different CDash project
+              #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+              set (SITE_BUILDNAME_SUFFIX "${{ steps.set-file-base.outputs.FILE_BASE }}")
+              #set (CMAKE_GENERATOR_TOOLSET "ClangCL")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
+              #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/clang.cmake")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
+
+      - name: Run ctest (Windows_clang) with clang
+        env:
+          BINSIGN: ${{ needs.check-secret.outputs.sign-state }}
+          SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Clang,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=VS202264,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+        shell: pwsh
+        continue-on-error: true
+
+      # Save log files created by ctest script
+      - name: Save log (Windows_clang)
+        uses: actions/upload-artifact@v4
+        with:
+          name: clang-win-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+  build_and_test_linux_clang:
+  # Linux (Ubuntu) w/ clang + CMake
+  #
+    name: "Ubuntu Clang CMake"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install CMake Dependencies (Linux_clang)
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build doxygen graphviz curl libncurses5
+
+      - name: add clang to env
+        uses: KyleMayes/install-llvm-action@v2.0.5
+        id: setup-clang
+        with:
+          env: true
+          version: '18'
+
+      - name: Set file base name (Linux_clang)
+        id: set-file-base
+        run: |
+          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
+          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
+          if [[ '${{ inputs.use_environ }}' == 'release' ]]
+          then
+            SOURCE_NAME_BASE=$(echo "${{ inputs.snap_name }}")
+          else
+            SOURCE_NAME_BASE=$(echo "hdfsrc")
+          fi
+          echo "SOURCE_BASE=$SOURCE_NAME_BASE" >> $GITHUB_OUTPUT
+
+      # Get files created by release script
+      - name: Get tgz-tarball (Linux_clang)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: tgz-tarball
+          path: ${{ github.workspace }}
+
+      - name: List files for the space (Linux_clang)
+        run: |
+          ls -l ${{ github.workspace }}
+          ls ${{ runner.workspace }}
+
+      - name: Uncompress source (Linux_clang)
+        run: tar -zxvf ${{ github.workspace }}/${{ steps.set-file-base.outputs.FILE_BASE }}.tar.gz
+
+      - name: Copy script files for the space (Linux_clang)
+        run: |
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/CTestScript.cmake ${{ runner.workspace }}/hdf5
+          cp ${{ github.workspace }}/${{ steps.set-file-base.outputs.SOURCE_BASE }}/config/cmake/scripts/HDF5config.cmake ${{ runner.workspace }}/hdf5
+
+      - name: List files for the hdf5 (Linux_clang)
+        run: |
+          ls ${{ runner.workspace }}/hdf5
+
+      - name: Create options file (Linux_clang)
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: ${{ runner.workspace }}/hdf5/HDF5options.cmake
+          write-mode: overwrite
+          contents: |
+              set (CTEST_DROP_SITE_INIT "my.cdash.org")
+              # Change following line to submit to your CDash dashboard to a different CDash project
+              set (SITE_BUILDNAME_SUFFIX "${{ steps.set-file-base.outputs.FILE_BASE }}")
+              #set (CTEST_DROP_LOCATION_INIT "/submit.php?project=HDF5")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
+              #set (CMAKE_GENERATOR_TOOLSET "clang")
+              #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/clang.cmake")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PLUGIN_SUPPORT:BOOL=ON")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLIBAEC_USE_LOCALCONTENT:BOOL=OFF")
+              set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
+
+      - name: Run ctest (Linux_clang)
+        run: |
+          cd "${{ runner.workspace }}/hdf5"
+          ctest -S HDF5config.cmake,CTEST_SITE_EXT=GH-Clang,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Release -VV -O hdf5.log
+        shell: bash
+        continue-on-error: true
+
+      # Save log files created by ctest script
+      - name: Save log (Linux_clang)
+        uses: actions/upload-artifact@v4
+        with:
+          name: clang-ubuntu-log
+          path: ${{ runner.workspace }}/hdf5/hdf5.log
+          if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
diff --git a/config/cmake/LIBAEC/CMakeLists.txt b/config/cmake/LIBAEC/CMakeLists.txt
index 5d978275565..2ac4f2c7ad3 100644
--- a/config/cmake/LIBAEC/CMakeLists.txt
+++ b/config/cmake/LIBAEC/CMakeLists.txt
@@ -121,21 +121,6 @@ if (WIN32)
   add_compile_definitions (_CONSOLE)
 endif ()
 
-#-----------------------------------------------------------------------------
-# Compiler specific flags : Shouldn't there be compiler tests for these
-#-----------------------------------------------------------------------------
-if (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-   set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
-endif ()
-
-#-----------------------------------------------------------------------------
-# This is in here to help some of the GCC based IDES like Eclipse
-# and code blocks parse the compiler errors and warnings better.
-#-----------------------------------------------------------------------------
-if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
-endif ()
-
 #-----------------------------------------------------------------------------
 # Generate the aec_config.h file containing user settings needed by compilation
 #-----------------------------------------------------------------------------
@@ -166,6 +151,12 @@ target_include_directories (${LIBAEC_LIB_TARGET} PUBLIC
   "$<BUILD_INTERFACE:${LIBAEC_SOURCE_DIR}/include>"
   "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>"
   "$<INSTALL_INTERFACE:include>")
+if (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+  target_compile_options(${LIBAEC_LIB_TARGET} PRIVATE -Wno-deprecated-non-prototype)
+endif ()
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  target_compile_options(${LIBAEC_LIB_TARGET} PRIVATE -fmessage-length=0)
+endif ()
 TARGET_C_PROPERTIES (${LIBAEC_LIB_TARGET} STATIC)
 H5_SET_LIB_OPTIONS (${LIBAEC_LIB_TARGET} ${LIBAEC_LIB_NAME} STATIC 0)
 set_target_properties (${LIBAEC_LIB_TARGET} PROPERTIES
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 6a8dc9af9fa..d1e1a8b4cc6 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -20,6 +20,7 @@ cmake_minimum_required (VERSION 3.18)
 # Usage:
 #     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log
 # where valid options for OPTION are:
+#     NINJA           - Use Ninja build system
 #     BUILD_GENERATOR - The cmake build generator:
 #            MinGW     * MinGW Makefiles
 #            Unix      * Unix Makefiles
@@ -111,69 +112,63 @@ if (NOT DEFINED HPC)
     set (SITE_OS_NAME "Windows")
     set (SITE_OS_VERSION "WIN10")
     if (BUILD_GENERATOR STREQUAL "VS202264")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
-      set (CMAKE_GENERATOR_ARCHITECTURE "x64")
+      if (DEFINED NINJA)
+        set (CTEST_CMAKE_GENERATOR "Ninja")
+      else ()
+         set (CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
+         set (CMAKE_GENERATOR_ARCHITECTURE "x64")
+      endif ()
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2022")
       set (SITE_COMPILER_VERSION "17")
     elseif (BUILD_GENERATOR STREQUAL "VS2022")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
-      set (CMAKE_GENERATOR_ARCHITECTURE "Win32")
+      if (DEFINED NINJA)
+        set (CTEST_CMAKE_GENERATOR "Ninja")
+      else ()
+        set (CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
+        set (CMAKE_GENERATOR_ARCHITECTURE "Win32")
+      endif ()
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2022")
       set (SITE_COMPILER_VERSION "17")
     elseif (BUILD_GENERATOR STREQUAL "VS201964")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
-      set (CMAKE_GENERATOR_ARCHITECTURE "x64")
+      if (DEFINED NINJA)
+        set (CTEST_CMAKE_GENERATOR "Ninja")
+      else ()
+        set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
+        set (CMAKE_GENERATOR_ARCHITECTURE "x64")
+      endif ()
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2019")
       set (SITE_COMPILER_VERSION "16")
     elseif (BUILD_GENERATOR STREQUAL "VS2019")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
-      set (CMAKE_GENERATOR_ARCHITECTURE "Win32")
+      if (DEFINED NINJA)
+        set (CTEST_CMAKE_GENERATOR "Ninja")
+      else ()
+        set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
+        set (CMAKE_GENERATOR_ARCHITECTURE "Win32")
+      endif ()
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2019")
       set (SITE_COMPILER_VERSION "16")
     elseif (BUILD_GENERATOR STREQUAL "VS201764")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
+      if (DEFINED NINJA)
+        set (CTEST_CMAKE_GENERATOR "Ninja")
+      else ()
+        set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
+      endif ()
       set (SITE_OS_BITS "64")
       set (SITE_COMPILER_NAME "vs2017")
       set (SITE_COMPILER_VERSION "15")
     elseif (BUILD_GENERATOR STREQUAL "VS2017")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
+      if (DEFINED NINJA)
+        set (CTEST_CMAKE_GENERATOR "Ninja")
+      else ()
+        set (CTEST_CMAKE_GENERATOR "Visual Studio 15 2017")
+      endif ()
       set (SITE_OS_BITS "32")
       set (SITE_COMPILER_NAME "vs2017")
       set (SITE_COMPILER_VERSION "15")
-    elseif (BUILD_GENERATOR STREQUAL "VS201564")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
-      set (SITE_OS_BITS "64")
-      set (SITE_COMPILER_NAME "vs2015")
-      set (SITE_COMPILER_VERSION "14")
-    elseif (BUILD_GENERATOR STREQUAL "VS2015")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
-      set (SITE_OS_BITS "32")
-      set (SITE_COMPILER_NAME "vs2015")
-      set (SITE_COMPILER_VERSION "14")
-    elseif (BUILD_GENERATOR STREQUAL "VS201364")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
-      set (SITE_OS_BITS "64")
-      set (SITE_COMPILER_NAME "vs2013")
-      set (SITE_COMPILER_VERSION "12")
-    elseif (BUILD_GENERATOR STREQUAL "VS2013")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")
-      set (SITE_OS_BITS "32")
-      set (SITE_COMPILER_NAME "vs2013")
-      set (SITE_COMPILER_VERSION "12")
-    elseif (BUILD_GENERATOR STREQUAL "VS201264")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
-      set (SITE_OS_BITS "64")
-      set (SITE_COMPILER_NAME "vs2012")
-      set (SITE_COMPILER_VERSION "11")
-    elseif (BUILD_GENERATOR STREQUAL "VS2012")
-      set (CTEST_CMAKE_GENERATOR "Visual Studio 11 2012")
-      set (SITE_OS_BITS "32")
-      set (SITE_COMPILER_NAME "vs2012")
-      set (SITE_COMPILER_VERSION "11")
     else ()
       message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2022, VS202264, VS2019, VS201964")
     endif ()
@@ -182,10 +177,14 @@ if (NOT DEFINED HPC)
       set (CTEST_SITE "WIN10${BUILD_GENERATOR}-${CTEST_SITE_EXT}")
     endif()
   else ()
-    if (MINGW)
-      set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
+    if (DEFINED NINJA)
+      set (CTEST_CMAKE_GENERATOR "Ninja")
     else ()
-      set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+      if (MINGW)
+        set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
+      else ()
+        set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+      endif ()
     endif ()
   ##  Set the following to unique id your computer  ##
     if (APPLE)