From 2bade15ae79984147d263ab714b1240ed14d38ac Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 6 Jan 2020 07:53:21 -0700 Subject: [PATCH 1/7] Update .gitmodules, add branch = ufs_release_1.0 for cmake --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 2d2fcfbe3..4580dc21c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "cmake"] path = cmake url = https://github.com/NOAA-EMC/CMakeModules.git + branch = ufs_release_1.0 From 0b23ed4a436a2dd59045ab35754e5293fc703e6d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 6 Jan 2020 09:29:16 -0700 Subject: [PATCH 2/7] Update .gitmodules for testing, code review and merging --- .gitmodules | 6 ++++-- cmake | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4580dc21c..0187abd9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,6 @@ [submodule "cmake"] path = cmake - url = https://github.com/NOAA-EMC/CMakeModules.git - branch = ufs_release_1.0 + #url = https://github.com/NOAA-EMC/CMakeModules.git + #branch = ufs_release_1.0 + url = https://github.com/climbfuji/CMakeModules.git + branch = dom_cleanup_work_20191206 diff --git a/cmake b/cmake index c4b0f3106..8cb156578 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit c4b0f3106d2b669a904c0bdb2fbb2146e97ebdde +Subproject commit 8cb156578620ce9ef8a20296717c3830b4f3762a From 54a260529d03424e8644a0bcecdba1b8e234e05f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 6 Jan 2020 13:55:22 -0700 Subject: [PATCH 3/7] Update include/lib flags for sigio, sfcio, nemsio --- sorc/ncep_post.fd/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sorc/ncep_post.fd/CMakeLists.txt b/sorc/ncep_post.fd/CMakeLists.txt index ad4fd0a21..2eaf6fafc 100644 --- a/sorc/ncep_post.fd/CMakeLists.txt +++ b/sorc/ncep_post.fd/CMakeLists.txt @@ -188,8 +188,8 @@ set_source_files_properties( ${EXE_C_SRC} PROPERTIES COMPILE_FLAGS ${CMAKE_C_FLA set_target_properties( ${EXENAME} PROPERTIES LINK_FLAGS ${OpenMP_Fortran_FLAGS} ) add_dependencies(${EXENAME} ${LIBNAME}) -include_directories( ${MPI_Fortran_MODULE_DIR} ${MPI_Fortran_INCLUDE_PATH} ${NETCDF_INCLUDES} ${SIGIO_INC} ${NEMSIO_INC} ${SFCIO_INC} ${W3EMC_INC4} ${G2_INC4} ${G2TMPL_INCd} ${GFSIO_INC} ${CRTM_INC} ) -target_link_libraries(${EXENAME} ${LIBNAME} ${SP_LIB4} ${SIGIO_LIB} ${SFCIO_LIB} ${GFSIO_LIB4} ${NEMSIO_LIB} ${IP_LIB4} ${W3EMC_LIB4} ${W3NCO_LIB4} ${G2TMPL_LIBd} ${G2_LIB4} ${CRTM_LIB} ${BACIO_LIB4} ${PNG_LIBRARIES} ${JASPER_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${CMAKE_DL_LIBS} ) +include_directories( ${MPI_Fortran_MODULE_DIR} ${MPI_Fortran_INCLUDE_PATH} ${NETCDF_INCLUDES} ${SIGIO_INC4} ${NEMSIO_INC} ${SFCIO_INC4} ${W3EMC_INC4} ${G2_INC4} ${G2TMPL_INCd} ${GFSIO_INC} ${CRTM_INC} ) +target_link_libraries(${EXENAME} ${LIBNAME} ${SP_LIB4} ${SIGIO_LIB4} ${SFCIO_LIB4} ${GFSIO_LIB4} ${NEMSIO_LIB} ${IP_LIB4} ${W3EMC_LIB4} ${W3NCO_LIB4} ${G2TMPL_LIBd} ${G2_LIB4} ${CRTM_LIB} ${BACIO_LIB4} ${PNG_LIBRARIES} ${JASPER_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${CMAKE_DL_LIBS} ) install(TARGETS ${EXENAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin From 8664d23043bc589f6b5716a2eafce72385bf507e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 7 Jan 2020 13:47:27 -0700 Subject: [PATCH 4/7] Add REQUIRED attribute to find_package calls in CMakeLists.txt --- CMakeLists.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d083e5938..ef42e3bb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,25 +39,25 @@ endif() if(POLICY CMP0012) cmake_policy(SET CMP0012 NEW) endif() -find_package( MPI ) -find_package( OpenMP ) -find_package( Jasper ) -find_package( LAPACK ) -find_package( SIGIO ) -find_package( PNG ) -find_package( ZLIB ) -find_package( W3NCO ) -find_package( G2 ) -find_package( G2TMPL ) -find_package( BACIO ) -find_package( IP ) -find_package( SP ) -find_package( SFCIO ) -find_package( NEMSIO ) -find_package( GFSIO ) -find_package( W3EMC ) -find_package( CRTM ) -find_package( HDF5 COMPONENTS C Fortran HL ) -find_package( NetCDF ) +find_package(MPI REQUIRED) +find_package(OpenMP) +find_package(LAPACK) +find_package(Jasper REQUIRED) +find_package(SIGIO REQUIRED) +find_package(PNG REQUIRED) +find_package(ZLIB REQUIRED) +find_package(W3NCO REQUIRED) +find_package(G2 REQUIRED) +find_package(G2TMPL REQUIRED) +find_package(BACIO REQUIRED) +find_package(IP REQUIRED) +find_package(SP REQUIRED) +find_package(SFCIO REQUIRED) +find_package(NEMSIO REQUIRED) +find_package(GFSIO REQUIRED) +find_package(W3EMC REQUIRED) +find_package(CRTM REQUIRED) +find_package(HDF5 COMPONENTS C Fortran HL REQUIRED) +find_package(NetCDF REQUIRED) add_subdirectory(sorc/ncep_post.fd) From e08626a59ccecb7415998207cdcecd9909181ba9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 7 Jan 2020 13:56:19 -0700 Subject: [PATCH 5/7] Comment out LAPACK dependency in CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef42e3bb3..66a374115 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ if(POLICY CMP0012) endif() find_package(MPI REQUIRED) find_package(OpenMP) -find_package(LAPACK) +#find_package(LAPACK) find_package(Jasper REQUIRED) find_package(SIGIO REQUIRED) find_package(PNG REQUIRED) From c6c6bb45aa23ddde583a878d83fa2ffbc25f9fa0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 8 Jan 2020 20:53:12 -0700 Subject: [PATCH 6/7] Revert change to .gitmodules, update submodule pointer for cmake --- .gitmodules | 6 ++---- cmake | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0187abd9c..4580dc21c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,4 @@ [submodule "cmake"] path = cmake - #url = https://github.com/NOAA-EMC/CMakeModules.git - #branch = ufs_release_1.0 - url = https://github.com/climbfuji/CMakeModules.git - branch = dom_cleanup_work_20191206 + url = https://github.com/NOAA-EMC/CMakeModules.git + branch = ufs_release_1.0 diff --git a/cmake b/cmake index 8cb156578..d4d73348a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8cb156578620ce9ef8a20296717c3830b4f3762a +Subproject commit d4d73348ae16ebb14ddf2c41d959675bbabf0f9e From cc9ac999f6f3e4cd052803ec793fb1928ddb4510 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Jan 2020 07:58:17 -0700 Subject: [PATCH 7/7] sorc/ncep_post.fd/CMakeLists.txt: change GFSIO_INC to GFSIO_INC4 --- sorc/ncep_post.fd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ncep_post.fd/CMakeLists.txt b/sorc/ncep_post.fd/CMakeLists.txt index 2eaf6fafc..49daed143 100644 --- a/sorc/ncep_post.fd/CMakeLists.txt +++ b/sorc/ncep_post.fd/CMakeLists.txt @@ -188,7 +188,7 @@ set_source_files_properties( ${EXE_C_SRC} PROPERTIES COMPILE_FLAGS ${CMAKE_C_FLA set_target_properties( ${EXENAME} PROPERTIES LINK_FLAGS ${OpenMP_Fortran_FLAGS} ) add_dependencies(${EXENAME} ${LIBNAME}) -include_directories( ${MPI_Fortran_MODULE_DIR} ${MPI_Fortran_INCLUDE_PATH} ${NETCDF_INCLUDES} ${SIGIO_INC4} ${NEMSIO_INC} ${SFCIO_INC4} ${W3EMC_INC4} ${G2_INC4} ${G2TMPL_INCd} ${GFSIO_INC} ${CRTM_INC} ) +include_directories( ${MPI_Fortran_MODULE_DIR} ${MPI_Fortran_INCLUDE_PATH} ${NETCDF_INCLUDES} ${SIGIO_INC4} ${NEMSIO_INC} ${SFCIO_INC4} ${W3EMC_INC4} ${G2_INC4} ${G2TMPL_INCd} ${GFSIO_INC4} ${CRTM_INC} ) target_link_libraries(${EXENAME} ${LIBNAME} ${SP_LIB4} ${SIGIO_LIB4} ${SFCIO_LIB4} ${GFSIO_LIB4} ${NEMSIO_LIB} ${IP_LIB4} ${W3EMC_LIB4} ${W3NCO_LIB4} ${G2TMPL_LIBd} ${G2_LIB4} ${CRTM_LIB} ${BACIO_LIB4} ${PNG_LIBRARIES} ${JASPER_LIBRARIES} ${NETCDF_LIBRARIES_F90} ${NETCDF_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES} ${MPI_Fortran_LIBRARIES} ${CMAKE_DL_LIBS} ) install(TARGETS ${EXENAME}