Merge pull request #49 from mbraakhekke/pull_request

Results from trial sources during CMake config are now cached
Goddard-Fortran-Ecosystem · Mar 3, 2024 · 3979699 · 3979699
2 parents 6fc14fa + a2d3214
commit 3979699
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 39 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fujitsu compiler support
 
+## Changed
+- Results from running trial sources during CMake config are now stored in the CMake cache
+
 ## [1.7.0] - 2023-11-29
 
 ### Fixed
@@ -74,7 +77,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add `NVHPC.cmake` file for NVHPC support
 
-
 ## [1.3.6] - 2021-11-16
 
 ### Fixed

diff --git a/cmake/check_intrinsic_kinds.cmake b/cmake/check_intrinsic_kinds.cmake
@@ -3,11 +3,13 @@ include (fortran_try)
 CHECK_Fortran_SOURCE_RUN (
   ${CMAKE_CURRENT_LIST_DIR}/trial_sources/LOGICAL_DEFAULT_KIND.F90
   _LOGICAL_DEFAULT_KIND
+  "Default logical kind"
   )
 
 CHECK_Fortran_SOURCE_RUN (
   ${CMAKE_CURRENT_LIST_DIR}/trial_sources/INT_DEFAULT_KIND.F90
   _INT_DEFAULT_KIND
+  "Default integer kind"
   )
 foreach (kind 8 16 32 64)
   set(CMAKE_REQUIRED_FLAGS = -fpp)
@@ -16,44 +18,52 @@ foreach (kind 8 16 32 64)
   CHECK_Fortran_SOURCE_RUN (
     ${CMAKE_CURRENT_LIST_DIR}/trial_sources/INT_KIND.F90
     _ISO_INT${kind}
+    "Integer(${kind}) kind"
     )
 
 endforeach()
 
 CHECK_Fortran_SOURCE_RUN (
   ${CMAKE_CURRENT_LIST_DIR}/trial_sources/REAL_DEFAULT_KIND.F90
   _REAL_DEFAULT_KIND
+  "Default real kind"
   )
 
 CHECK_Fortran_SOURCE_RUN (
   ${CMAKE_CURRENT_LIST_DIR}/trial_sources/DOUBLE_DEFAULT_KIND.F90
   _DOUBLE_DEFAULT_KIND
+  "Default double kind"
   )
 
 foreach (kind 32 64 128)
-  set(CMAKE_REQUIRED_FLAGS = -fpp)
-  set(CMAKE_REQUIRED_DEFINITIONS -D_KIND=REAL${kind})
 
-  try_compile (
-    code_compiles
-    ${GFTL_SHARED_BINARY_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}/trial_sources/REAL_KIND.F90
-    CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_REQUIRED_DEFINITIONS}")
+  if (NOT DEFINED CACHE{GFTL_SHARED_ISO_REAL${kind}})
 
-  if (code_compiles)
-    CHECK_Fortran_SOURCE_RUN (
+    set(CMAKE_REQUIRED_FLAGS = -fpp)
+    set(CMAKE_REQUIRED_DEFINITIONS -D_KIND=REAL${kind})
+
+    try_compile (
+      code_compiles
+      ${GFTL_SHARED_BINARY_DIR}
+      ${CMAKE_CURRENT_LIST_DIR}/trial_sources/REAL_KIND.F90
+      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_REQUIRED_DEFINITIONS}")
+
+    if (code_compiles)
+      CHECK_Fortran_SOURCE_RUN (
+        ${CMAKE_CURRENT_LIST_DIR}/trial_sources/REAL_KIND.F90
+        _ISO_REAL${kind}
+        "Real(${kind}) kind"
+        )
+    endif ()
+
+    try_compile (
+      code_compiles
+      ${GFTL_SHARED_BINARY_DIR}
       ${CMAKE_CURRENT_LIST_DIR}/trial_sources/REAL_KIND.F90
-      _ISO_REAL${kind}
-      )
+      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_REQUIRED_DEFINITIONS}")
+
   endif ()
 
-  try_compile (
-    code_compiles
-    ${GFTL_SHARED_BINARY_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}/trial_sources/REAL_KIND.F90
-    CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_REQUIRED_DEFINITIONS}")
-
-
 endforeach()
 
 

diff --git a/cmake/fortran_try.cmake b/cmake/fortran_try.cmake
@@ -1,29 +1,43 @@
-macro (CHECK_FORTRAN_SOURCE_RUN file var)
+macro (CHECK_FORTRAN_SOURCE_RUN file var docstr)
 
-  try_run (
-    run compile
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${file}
-    CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_REQUIRED_DEFINITIONS}"
-    RUN_OUTPUT_VARIABLE ${var}
-    )
-
-  # Successful runs return "0", which is opposite of CMake sense of "if":
-  if (NOT run)
-    string(STRIP ${${var}} ${var})
-    if (NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Performing Test ${var}: SUCCESS (value=${${var}})")
-    endif ()
-
-    add_definitions(-D${var}=${${var}})
-
+  if (DEFINED CACHE{GFTL_SHARED${var}})
+    set( ${var} ${GFTL_SHARED${var}})
   else ()
+    try_run (
+      run compile
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${file}
+      CMAKE_FLAGS "-DCOMPILE_DEFINITIONS=${CMAKE_REQUIRED_DEFINITIONS}"
+      RUN_OUTPUT_VARIABLE ${var}
+      )
+
+    # Successful runs return "0", which is opposite of CMake sense of "if":
+    if (NOT run)
+      string(STRIP ${${var}} ${var})
+      if (NOT CMAKE_REQUIRED_QUIET)
+        message(STATUS "Performing Test ${var}: SUCCESS (value=${${var}})")
+      endif ()
+
+      set (GFTL_SHARED${var}
+        ${${var}}
+        CACHE
+        STRING
+        ${docstr}
+        )
+
+    else ()
+
+      if (NOT CMAKE_REQUIRED_QUIET)
+        message(STATUS "Performing Test ${var}: FAILURE")
+      endif ()
 
-    if (NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Performing Test ${var}: FAILURE")
     endif ()
 
   endif ()
+
+  if (NOT ${${var}} EQUAL "")
+    add_definitions(-D${var}=${${var}})
+  endif ()
 
 endmacro (CHECK_FORTRAN_SOURCE_RUN)