Merge CMake,doxygen changes from develop,1.10 branches (HDFGroup#3578)

* Merge CMake,doxygen changes from develop,1.10 branches

* revert incorrect option in AT TS build

* Use variable for ignore-eol usage.

* Add last_test depends logic

* Just print status on CMake below 3.14

.github/workflows/main.yml

@@ -336,30 +336,31 @@ jobs:
       - name: Dump matrix context
         run: echo '${{ toJSON(matrix) }}'
 
-      - name: Install CMake Dependencies (Linux)
-        run: sudo apt-get install ninja-build doxygen graphviz
-        if: matrix.os == 'ubuntu-latest'
-
-      - name: Install Autotools Dependencies (Linux, serial)
+      # Only CMake need ninja-build, but we just install it unilaterally
+      # libssl, etc. are needed for the ros3 VFD
+      - name: Install Linux Dependencies
         run: |
            sudo apt update
-           sudo apt install automake autoconf libtool libtool-bin
-           sudo apt install gcc-12 g++-12 gfortran-12
+           sudo apt-get install ninja-build doxygen graphviz
            sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
+           sudo apt install gcc-12 g++-12 gfortran-12
            echo "CC=gcc-12" >> $GITHUB_ENV
            echo "CXX=g++-12" >> $GITHUB_ENV
            echo "FC=gfortran-12" >> $GITHUB_ENV
+        if: matrix.os == 'ubuntu-latest'
+
+      # CMake gets libaec from fetchcontent
+      - name: Install Autotools Dependencies (Linux)
+        run: |
+           sudo apt install automake autoconf libtool libtool-bin
            sudo apt install libaec0 libaec-dev
-        if: (matrix.generator == 'autogen') && (matrix.parallel != 'enable')
+        if: (matrix.generator == 'autogen')
 
       - name: Install Autotools Dependencies (Linux, parallel)
         run: |
-           sudo apt update
-           sudo apt install automake autoconf libtool libtool-bin
            sudo apt install openmpi-bin openmpi-common mpi-default-dev
            echo "CC=mpicc" >> $GITHUB_ENV
            echo "FC=mpif90" >> $GITHUB_ENV
-           sudo apt install libaec0 libaec-dev
         if: (matrix.generator == 'autogen') && (matrix.parallel == 'enable')
 
       - name: Install Dependencies (Windows)
@@ -390,7 +391,19 @@ jobs:
           sh ./autogen.sh
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --${{ matrix.deprec_sym }}-deprecated-symbols --with-default-api-version=${{ matrix.default_api }} --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd --${{ matrix.ros3_vfd }}-ros3-vfd --with-szlib=${{ matrix.szip }}
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure \
+            --enable-build-mode=${{ matrix.build_mode.autotools }} \
+            --${{ matrix.deprec_sym }}-deprecated-symbols \
+            --with-default-api-version=${{ matrix.default_api }} \
+            --enable-shared \
+            --${{ matrix.parallel }}-parallel \
+            --${{ matrix.cpp }}-cxx \
+            --${{ matrix.fortran }}-fortran \
+            --${{ matrix.java }}-java \
+            --${{ matrix.mirror_vfd }}-mirror-vfd \
+            --${{ matrix.direct_vfd }}-direct-vfd \
+            --${{ matrix.ros3_vfd }}-ros3-vfd \
+            --with-szlib=${{ matrix.szip }}
         shell: bash
         if: (matrix.generator == 'autogen') && ! (matrix.thread_safety.enabled)
 
@@ -399,7 +412,15 @@ jobs:
           sh ./autogen.sh
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --enable-shared --enable-threadsafe --disable-hl --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd --${{ matrix.ros3_vfd }}-ros3-vfd --with-szlib=${{ matrix.szip }}
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure \
+            --enable-build-mode=${{ matrix.build_mode.autotools }} \
+            --enable-shared \
+            --enable-threadsafe \
+            --disable-hl \
+            --${{ matrix.mirror_vfd }}-mirror-vfd \
+            --${{ matrix.direct_vfd }}-direct-vfd \
+            --${{ matrix.ros3_vfd }}-ros3-vfd \
+            --with-szlib=${{ matrix.szip }}
         shell: bash
         if: (matrix.generator == 'autogen') && (matrix.thread_safety.enabled)
 
@@ -411,7 +432,25 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} -DHDF5_BUILD_DOC=${{ matrix.docs }} -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} $GITHUB_WORKSPACE
+          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
+            ${{ matrix.generator }} \
+            -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} \
+            -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
+            -DBUILD_SHARED_LIBS=ON \
+            -DHDF5_ENABLE_ALL_WARNINGS=ON \
+            -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
+            -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \
+            -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} \
+            -DHDF5_BUILD_JAVA=${{ matrix.java }} \
+            -DHDF5_BUILD_DOC=${{ matrix.docs }} \
+            -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} \
+            -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} \
+            -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} \
+            -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} \
+            -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} \
+            -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} \
+            -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} \
+            $GITHUB_WORKSPACE
         shell: bash
         if: (matrix.generator != 'autogen') && ! (matrix.thread_safety.enabled)
 
@@ -420,7 +459,27 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_DOC=OFF -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} $GITHUB_WORKSPACE
+          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
+            ${{ matrix.generator }} \
+            -DCMAKE_BUILD_TYPE=${{ matrix.build_mode.cmake }} \
+            -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
+            -DBUILD_SHARED_LIBS=ON \
+            -DHDF5_ENABLE_ALL_WARNINGS=ON \
+            -DHDF5_ENABLE_THREADSAFE:BOOL=ON \
+            -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
+            -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
+            -DHDF5_BUILD_FORTRAN:BOOL=OFF \
+            -DHDF5_BUILD_JAVA:BOOL=OFF \
+            -DHDF5_BUILD_HL_LIB:BOOL=OFF \
+            -DHDF5_BUILD_DOC=OFF \
+            -DBUILD_SZIP_WITH_FETCHCONTENT=${{ matrix.libaecfc }} \
+            -DLIBAEC_USE_LOCALCONTENT=${{ matrix.localaec }} \
+            -DBUILD_ZLIB_WITH_FETCHCONTENT=${{ matrix.zlibfc }} \
+            -DZLIB_USE_LOCALCONTENT=${{ matrix.localzlib }} \
+            -DHDF5_ENABLE_MIRROR_VFD:BOOL=${{ matrix.mirror_vfd }} \
+            -DHDF5_ENABLE_DIRECT_VFD:BOOL=${{ matrix.direct_vfd }} \
+            -DHDF5_ENABLE_ROS3_VFD:BOOL=${{ matrix.ros3_vfd }} \
+            $GITHUB_WORKSPACE
         shell: bash
         if: (matrix.generator != 'autogen') && (matrix.thread_safety.enabled)
 

.github/workflows/netcdf.yml

@@ -14,6 +14,9 @@ on:
       - 'COPYING**'
       - '**.md'
 
+permissions:
+  contents: read
+
 # Using concurrency to cancel any in-progress job or run
 concurrency:
   group: ${{ github.workflow }}-${{ github.sha || github.event.pull_request.number }}

CMakeFilters.cmake

@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-option (USE_LIBAEC "Use AEC library as SZip Filter" OFF)
+option (USE_LIBAEC "Use AEC library as SZip Filter" ON)
 option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
 option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 0)
 option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 0)

CMakeInstallation.cmake

@@ -390,7 +390,13 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}")
     set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}")
     if (BUILD_SHARED_LIBS)
-      set(CPACK_WIX_PATCH_FILE "${HDF_RESOURCES_DIR}/patch.xml")
+      if (${HDF_CFG_NAME} MATCHES "Debug" OR ${HDF_CFG_NAME} MATCHES "Developer")
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      else ()
+        set (WIX_CMP_NAME "${HDF5_LIB_NAME}")
+      endif ()
+      configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY)
+      set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml")
     endif ()
   elseif (APPLE)
     list (APPEND CPACK_GENERATOR "STGZ")

config/cmake/fileCompareTest.cmake

@@ -59,7 +59,7 @@ if (TEST_STRINGS STREQUAL "YES")
   endif ()
 else ()
   if (CMAKE_VERSION VERSION_LESS "3.14.0")
-    message (FATAL_ERROR "CANNOT get file size, file command SIZE not supported")
+    message (STATUS "CANNOT get file size, file command SIZE not supported")
   else ()
     file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
     file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
@@ -74,7 +74,7 @@ else ()
     elseif (TEST_FUNCTION MATCHES "LTEQ")
       if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
         if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+          message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
         endif ()
       else ()
         message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")

config/cmake/hdf5-config.cmake.in

@@ -44,14 +44,16 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
+set (${HDF5_PACKAGE_NAME}_ENABLE_ROS3_VFD      @HDF5_ENABLE_ROS3_VFD@)
 set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS    @H5_ENABLE_SHARED_LIB@)
 set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS    @H5_ENABLE_STATIC_LIB@)
 set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)
 set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@)
 set (${HDF5_PACKAGE_NAME}_ARCHITECTURE "@CMAKE_GENERATOR_ARCHITECTURE@")
 set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
 set (${HDF5_PACKAGE_NAME}_DEFAULT_API_VERSION "@DEFAULT_API_VERSION@")
-set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@")
+set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES @PARALLEL_FILTERED_WRITES@)
+set (${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN "@HDF5_INSTALL_MOD_FORTRAN@")
 
 #-----------------------------------------------------------------------------
 # Dependencies
@@ -67,6 +69,11 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
   find_package(MPI QUIET REQUIRED)
 endif ()
 
+if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE)
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads QUIET REQUIRED)
+endif ()
+
 if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
   set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
       @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
@@ -143,14 +150,14 @@ foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS)
     list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
     set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
 
-    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "SHARED")
       set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/shared")
     endif ()
   elseif (comp STREQUAL "static")
     list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp})
     set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp})
 
-    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "STATIC")
       set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/static")
     endif ()
   endif ()

config/cmake/patch.xml → config/cmake/patch.xml.in

@@ -1,5 +1,5 @@
 <CPackWiXPatch>
-    <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
+    <CPackWiXFragment Id="CM_CP_libraries.bin.@WIX_CMP_NAME@.dll">
         <Environment Id="PATH" 
              Name="PATH" 
              Value="[CM_DP_libraries.bin]" 

config/cmake/runTest.cmake

@@ -122,6 +122,10 @@ if (NOT TEST_RESULT EQUAL TEST_EXPECT)
       file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
       message (STATUS "Output :\n${TEST_STREAM}")
     endif ()
+    if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
+      file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+      message (STATUS "Error Output :\n${TEST_STREAM}")
+    endif ()
   endif ()
   message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
 endif ()

config/cmake/scripts/HDF5options.cmake

@@ -69,9 +69,9 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRIN
 
 ### disable using ext zlib
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")
-### enable using ext szip
-#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")
+### disable using ext szip
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
 
 ####      package examples       ####
 #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-2.0.3-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")

config/sanitizer/README.md

@@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES
 )
 
 cmake_format(TARGET_NAME ${CMAKE_FILES})
-```
+```

config/toolchain/build32.cmake

@@ -42,7 +42,7 @@ elseif(MINGW)
   set (CMAKE_CROSSCOMPILING_EMULATOR wine)
 
   include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
-  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+  set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
 else ()
   set (CMAKE_SYSTEM_NAME Linux)
 

config/toolchain/clang.cmake

@@ -1,16 +1,16 @@
 # Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "clang")
+set (CMAKE_COMPILER_VENDOR "clang")
 
 if(WIN32)
-  set(CMAKE_C_COMPILER clang-cl)
-  set(CMAKE_CXX_COMPILER clang-cl)
+  set (CMAKE_C_COMPILER clang-cl)
+  set (CMAKE_CXX_COMPILER clang-cl)
 else()
-  set(CMAKE_C_COMPILER clang)
-  set(CMAKE_CXX_COMPILER clang++)
+  set (CMAKE_C_COMPILER clang)
+  set (CMAKE_CXX_COMPILER clang++)
 endif()
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")

config/toolchain/crayle.cmake

@@ -1,10 +1,10 @@
 # The following line will use cross-compiling
-set(CMAKE_SYSTEM_NAME Linux)
+set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
+set (CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
 
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_Fortran_COMPILER ftn)
+set (CMAKE_C_COMPILER cc)
+set (CMAKE_Fortran_COMPILER ftn)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")

config/toolchain/gcc.cmake

@@ -1,11 +1,11 @@
 # Uncomment the following line and the correct system name to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "GCC")
+set (CMAKE_COMPILER_VENDOR "GCC")
 
-set(CMAKE_C_COMPILER cc)
-set(CMAKE_CXX_COMPILER c++)
-set(CMAKE_Fortran_COMPILER gfortran)
+set (CMAKE_C_COMPILER cc)
+set (CMAKE_CXX_COMPILER c++)
+set (CMAKE_Fortran_COMPILER gfortran)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")

config/toolchain/mingw64.cmake

@@ -11,4 +11,4 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
 
 include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
+set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")

config/toolchain/pgi.cmake

@@ -1,11 +1,11 @@
 # Uncomment the following to use cross-compiling
-#set(CMAKE_SYSTEM_NAME Linux)
+#set (CMAKE_SYSTEM_NAME Linux)
 
-set(CMAKE_COMPILER_VENDOR "PGI")
+set (CMAKE_COMPILER_VENDOR "PGI")
 
-set(CMAKE_C_COMPILER pgcc)
-set(CMAKE_CXX_COMPILER pgc++)
-set(CMAKE_Fortran_COMPILER pgf90)
+set (CMAKE_C_COMPILER pgcc)
+set (CMAKE_CXX_COMPILER pgc++)
+set (CMAKE_Fortran_COMPILER pgf90)
 
 # the following is used if cross-compiling
-set(CMAKE_CROSSCOMPILING_EMULATOR "")
+set (CMAKE_CROSSCOMPILING_EMULATOR "")