fix standalone build

Author: jedwards4b

CMakeLists.txt

@@ -4,7 +4,7 @@ project(NUOPC_DATA_MODELS LANGUAGES Fortran VERSION 0.1)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(ExternalProject)
 find_package(ESMF REQUIRED)
-find_package(PIO REQUIRED)
+find_package(PIO REQUIRED COMPONENT C Fortran)
 find_package(FoX REQUIRED)
 
 if (DEFINED CIMEROOT)

cmake/FindFoX.cmake

@@ -1,8 +1,8 @@
-# - Try to find FoX 
+# - Try to find FoX
+#
+# This can be controled by setting FoX_PATH or FoX_<lang>_PATH Cmake variables,
+# where <lang> is the COMPONENT language one needs.
 #
-# This can be controled by setting FoX_PATH or FoX_<lang>_PATH Cmake variables, 
-# where <lang> is the COMPONENT language one needs. 
-# 
 # Once done, this will define:
 #
 #  FoX_<lang>_FOUND   (BOOL) - system has FoX
@@ -36,5 +36,5 @@ foreach (pcomp IN LISTS FoX_FIND_VALID_COMPONENTS)
     find_package_component(FoX COMPONENT ${pcomp})
 endforeach ()
 if(FoX_Fortran_FOUND)
-message(" Found FoX:")
+message(" Found FoX: ${FoX_Fortran_INCLUDE_DIR}")
 endif()

cmake/FindPIO.cmake

@@ -1,8 +1,8 @@
-# - Try to find PIO 
+# - Try to find PIO
+#
+# This can be controled by setting PIO_PATH or PIO_<lang>_PATH Cmake variables,
+# where <lang> is the COMPONENT language one needs.
 #
-# This can be controled by setting PIO_PATH or PIO_<lang>_PATH Cmake variables, 
-# where <lang> is the COMPONENT language one needs. 
-# 
 # Once done, this will define:
 #
 #  PIO_<lang>_FOUND   (BOOL) - system has PIO
@@ -23,14 +23,15 @@ define_package_component(PIO DEFAULT
                          LIBRARY_NAMES pioc)
 
 # Define PIO Fortran Component
-define_package_component(PIO 
-                         Component Fortran
+define_package_component(PIO
+                         COMPONENT Fortran
                          INCLUDE_NAMES pio.mod pio.inc
                          LIBRARY_NAMES piof)
 
 # Search for list of valid components requested
 find_valid_components(PIO)
 
+message("This is ${PIO_FIND_COMPONENTS}")
 #==============================================================================
 # SEARCH FOR VALIDATED COMPONENTS
 foreach (pcomp IN LISTS PIO_FIND_VALID_COMPONENTS)
@@ -100,4 +101,4 @@ foreach (pcomp IN LISTS PIO_FIND_VALID_COMPONENTS)
 endforeach ()
 message("PIO_C_FOUND ${PIO_C_FOUND}")
 message("PIO_Fortran_FOUND ${PIO_Fortran_FOUND}")
-message("PIO_INCLUDE_DIR ${PIO_INCLUDE_DIR}")
+message("PIO_Fortran_INCLUDE_DIR ${PIO_Fortran_INCLUDE_DIR}")

share/CMakeLists.txt

@@ -19,7 +19,7 @@ add_library(cdeps_share  ${GenF90_SRCS}
 			 shr_strconvert_mod.F90
 			 shr_precip_mod.F90
 			 shr_string_mod.F90)
-message("HERE ${PIO_Fortran_INCLUDE_DIR}")
+
 target_include_directories (cdeps_share PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${ESMF_F90COMPILEPATHS} ${PIO_Fortran_INCLUDE_DIRS})
 
 

streams/CMakeLists.txt

@@ -17,8 +17,8 @@ if(BLD_STANDALONE)
   add_dependencies(streams cdeps_share)
 endif()
 target_include_directories (streams PUBLIC ${ESMF_F90COMPILEPATHS})
-target_include_directories (streams PUBLIC ${PIO_INCDIR})
-target_include_directories (streams PUBLIC ${FOX}/finclude)
+target_include_directories (streams PUBLIC ${PIO_Fortran_INCLUDE_DIR})
+target_include_directories (streams PUBLIC ${FoX_Fortran_INCLUDE_DIR})
 target_include_directories (streams PUBLIC ${CMAKE_BINARY_DIR}/share)
 install(TARGETS streams
         LIBRARY DESTINATION lib)