Implement CMake changes requested during code review.

Author: nusbaume

src/physics/utils/CMakeLists.txt

@@ -1,4 +1,7 @@
-set(IO_READER_SOURCE pio_reader.F90 pio_reader_sub.F90 ${CMAKE_CURRENT_SOURCE_DIR}/../ncar_ccpp/phys_utils/ccpp_io_reader.F90 ${CMAKE_CURRENT_SOURCE_DIR}/../../../share/src/shr_kind_mod.F90)
+set(IO_READER_SOURCE pio_reader.F90
+	             pio_reader_sub.F90
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../ncar_ccpp/phys_utils/ccpp_io_reader.F90
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../../share/src/shr_kind_mod.F90)
 
 # io_reader is not integrated into the CMake build of any top level
 # project yet and this CMake is for testing purposes only.

test/unit/fortran/CMakeLists.txt

@@ -15,7 +15,7 @@ endif()
 
 # Overwrite the init flags chosen by CMake
 if(${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
-  add_compile_options(-ffree-line-length-none -std=f2018)
+  add_compile_options(-ffree-line-length-none)
 endif()
 
 if(CAM_SIMA_ENABLE_CODE_COVERAGE)
@@ -34,15 +34,17 @@ if(CAM_SIMA_ENABLE_TESTS OR CAM_SIMA_ENABLE_CODE_COVERAGE OR CAM_SIMA_ENABLE_IO_
     add_subdirectory(src/core_utils)
   endif()
   if(CAM_SIMA_ENABLE_IO_TESTS)
-    find_package(MPI REQUIRED COMPONENTS Fortran C)
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+    find_package(MPI REQUIRED COMPONENTS Fortran C)
     find_package(NetCDF REQUIRED COMPONENTS Fortran C)
     find_package(PIO REQUIRED COMPONENTS Fortran C)
 
     add_subdirectory(ccpp_framework_stub)
     add_subdirectory(mock_routines)
 
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../../src/physics/utils ${CMAKE_CURRENT_BINARY_DIR}/src/physics/utils)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../../src/physics/utils
+	             ${CMAKE_CURRENT_BINARY_DIR}/src/physics/utils)
 
     add_subdirectory(src/pio_reader)
   endif()

test/unit/fortran/ccpp_framework_stub/CMakeLists.txt

@@ -1 +1,2 @@
-    add_library(ccpp_framework ccpp_kinds.F90)
+    add_library(ccpp_framework ccpp_kinds.F90)
+