Merge pull request #330 from Goddard-Fortran-Ecosystem/hotfix/#329-su…

…brepo-bugfixes

Fixes #329

CMakeLists.txt

@@ -142,10 +142,12 @@ if (ENABLE_TESTS)
   enable_testing()
   add_custom_target(build-tests)
 
-  add_custom_target(tests
-    COMMAND ${CMAKE_CTEST_COMMAND}
-    EXCLUDE_FROM_ALL)
-  add_dependencies(tests build-tests)
+  if (NOT TARGET tests)
+    add_custom_target(tests
+      COMMAND ${CMAKE_CTEST_COMMAND}
+      EXCLUDE_FROM_ALL)
+    add_dependencies(tests build-tests)
+  endif ()
 
   add_subdirectory (tests EXCLUDE_FROM_ALL)
 

ChangeLog.md

@@ -5,12 +5,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [4.2.2] - 2021-09-17
+## [4.2.2] - 2021-11-15
 
 ### Fixed
-
  - Fix for OpenMP handling in `PFUNITCmake.cmake`. If you skip OpenMP, it is no
    longer a dependency
+ - Updated external modules that contain bugfixes.
+ - Fixed cmake logic that fails on enabling tests if using submodules.
+ - Allow GFortran to use longer lines.  (Impacts some upstream use cases.)
 
 ### Changed
 

cmake/GNU.cmake

@@ -6,7 +6,7 @@ set (cpp "-cpp")
 set (MISMATCH "-fallow-argument-mismatch")
 set(opt "-O0")
 
-set(common_flags "${cpp} ${opt} -ffree-line-length-512")
+set(common_flags "${cpp} ${opt} -ffree-line-length-none")
 if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
   set (common_flags "${common_flags} ${MISMATCH}")
 endif ()