cmake improvements

.github/workflows/build.yml

@@ -34,7 +34,8 @@ jobs:
       - name: Install dependencies
         run: |
           conda install \
-            cmake \
+            cmake=3.31.2 \
+            rhash=1.4.3 \
             make \
             mpich-mpicxx \
             exodusii==2022.10.* \
@@ -43,6 +44,7 @@ jobs:
             pybind11 \
             pytest \
             flake8 \
+            gtest \
             lcov
 
       - name: Configure

.github/workflows/gh-pages.yml

@@ -29,7 +29,8 @@ jobs:
       - name: Install dependencies
         run: |
           conda install \
-            cmake \
+            cmake=3.31.2 \
+            rhash=1.4.3 \
             make \
             mpich-mpicxx \
             exodusii==2022.10.* \

.github/workflows/qa.yml

@@ -52,9 +52,11 @@ jobs:
       - name: Install dependencies
         run: |
           conda install \
-            cmake \
+            cmake=3.31.2 \
+            rhash=1.4.3 \
             make \
             mpich-mpicxx \
+            gtest \
             exodusii==2022.10.* \
             fmt=11.* \
             yaml-cpp==0.8.0

CMakeLists.txt

@@ -5,8 +5,6 @@ project(exodusIIcpp
     LANGUAGES CXX C
 )
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 include(FetchContent)
@@ -32,29 +30,6 @@ find_package(NetCDF 4.5 REQUIRED)
 find_package(HDF5 1.10 REQUIRED COMPONENTS C)
 find_package(ExodusII REQUIRED)
 
-if (EXODUSIICPP_BUILD_TESTS)
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG        v1.15.2
-    )
-    set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
-    mark_as_advanced(FORCE
-        BUILD_GMOCK
-        INSTALL_GTEST
-        FETCHCONTENT_SOURCE_DIR_GOOGLETEST
-        FETCHCONTENT_UPDATES_DISCONNECTED_GOOGLETEST
-    )
-
-    FetchContent_MakeAvailable(googletest)
-    mark_as_advanced(FORCE
-        FETCHCONTENT_BASE_DIR
-        FETCHCONTENT_FULLY_DISCONNECTED
-        FETCHCONTENT_QUIET
-        FETCHCONTENT_UPDATES_DISCONNECTED
-    )
-endif()
-
 add_subdirectory(src)
 if (EXODUSIICPP_BUILD_TOOLS)
     add_subdirectory(tools)

cmake/exodusiicpp-config.cmake.in

@@ -9,6 +9,7 @@ include(CMakeFindDependencyMacro)
 
 find_dependency(fmt 11 REQUIRED)
 find_dependency(NetCDF REQUIRED)
+find_dependency(HDF5 1.10 REQUIRED COMPONENTS C)
 find_dependency(ExodusII REQUIRED)
 check_required_components(exodusIIcpp)
 

src/CMakeLists.txt

@@ -7,6 +7,9 @@ add_library(
         node_set.cpp
         side_set.cpp
 )
+
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
+
 if(CMAKE_PROJECT_NAME STREQUAL "exodusIIcpp")
     target_code_coverage(${PROJECT_NAME})
     target_sanitization(${PROJECT_NAME})
@@ -48,7 +51,7 @@ if (EXODUSIICPP_INSTALL)
     )
     write_basic_package_version_file(exodusiicpp-config-version.cmake
         VERSION ${PROJECT_VERSION}
-        COMPATIBILITY AnyNewerVersion
+        COMPATIBILITY SameMajorVersion
     )
 
     install(
@@ -82,4 +85,4 @@ if (EXODUSIICPP_INSTALL)
             "${CMAKE_SOURCE_DIR}/cmake/FindNetCDF.cmake"
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/exodusIIcpp
     )
-endif()
+endif()

test/CMakeLists.txt

@@ -1,9 +1,6 @@
 project(exodusIIcpp-test)
 
-include(GoogleTest)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
+find_package(GTest REQUIRED)
 
 add_executable(${PROJECT_NAME}
     ElementBlock_test.cpp
@@ -27,8 +24,7 @@ target_link_libraries(
     ${PROJECT_NAME}
     PUBLIC
         exodusIIcpp
-        gtest_main
-        gmock_main
+        GTest::gmock_main
 )
 
 target_compile_definitions(${PROJECT_NAME}

tools/exo2yml/CMakeLists.txt

@@ -1,8 +1,5 @@
 project(exo2yml LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 find_package(yaml-cpp 0.8 REQUIRED)
 
 add_executable(${PROJECT_NAME}

tools/yml2exo/CMakeLists.txt

@@ -1,8 +1,5 @@
 project(yml2exo LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 find_package(yaml-cpp 0.8 REQUIRED)
 
 add_executable(${PROJECT_NAME}