Merge pull request #5 from mark-a-potts/feature/cmake

CMAKE fixes for WCOSS Cray
GeorgeGayno-NOAA · Apr 8, 2020 · d79f130 · d79f130
2 parents 66db63d + 1ad22c1
commit d79f130
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(
   ufs_util
   VERSION ${pVersion}
   LANGUAGES Fortran)
-
+# LANGUAGES C CXX Fortran)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 
 if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
@@ -43,8 +43,9 @@ if(NOT NETCDF)
   endif()
 endif()
 find_package(NetCDF MODULE REQUIRED)
-
-find_package(MPI REQUIRED COMPONENTS Fortran)
+#unset(CMAKE_C_COMPILER_LOADED)
+#unset(CMAKE_CXX_COMPILER_LOADED)
+find_package(MPI REQUIRED )
 find_package(ESMF MODULE REQUIRED)
 find_package(WGRIB2 REQUIRED)
 

diff --git a/cmake b/cmake
diff --git a/sorc/build_chgres_cube.sh b/sorc/build_chgres_cube.sh
@@ -36,7 +36,11 @@ rm -fr ../build
 mkdir ../build
 cd ../build
 echo $ESMFMKFILE
-cmake .. -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_INSTALL_PREFIX=../
+if [[ $target == "wcoss_cray" ]]; then
+  /u/Mark.Potts/bin/cmake .. -DCMAKE_INSTALL_PREFIX=../
+else
+  cmake .. -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_INSTALL_PREFIX=../
+fi
 make -j 8 VERBOSE=1
 make install
 exit