Cmake update (LLNL#5)

* Modify how cmake find/use NetCDF

* Clean up cmake scripts

Author: jeanlucf22

CMakeLists.txt

@@ -1,13 +1,12 @@
 cmake_minimum_required(VERSION 3.1)
-project (PFiSM)
+project (AMPE)
 
-set (CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
 
-#set(MPI_CXX_COMPILER CMAKE_CXX_COMPILER)
 find_package(MPI)
 if(MPI_FOUND)
   message(STATUS
@@ -40,7 +39,9 @@ endif()
 link_directories( ${SAMRAI_DIR}/lib )
 link_directories( ${HYPRE_DIR}/lib )
 link_directories( ${SUNDIALS_DIR}/lib )
-link_directories( ${NETCDF_DIR}/lib )
+
+find_package(netCDF REQUIRED)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
 
 set( PROJECT_LINK_LIBS1 libSAMRAI_tbox.a )
 set( PROJECT_LINK_LIBS2 libSAMRAI_math.a )
@@ -66,13 +67,12 @@ set( PROJECT_LINK_LIBS_HYPRE libHYPRE.so )
 set( PROJECT_LINK_LIBS_CVODE libsundials_cvode.a )
 set( PROJECT_LINK_LIBS_CPODES libsundials_cpodes.a )
 
-set( PROJECT_LINK_LIBS_NETCDFCXX libnetcdf_c++4.a )
-set( PROJECT_LINK_LIBS_NETCDF libnetcdf.a )
+set( PROJECT_LINK_LIBS_NETCDFCXX NetCDF::NetCDF )
+set( PROJECT_LINK_LIBS_NETCDF NetCDF::NetCDF )
 
 include_directories( ${SAMRAI_DIR}/include )
 include_directories( ${HYPRE_DIR}/include )
 include_directories( ${SUNDIALS_DIR}/include )
-include_directories( ${NETCDF_DIR}/include )
 
 enable_testing()
 
@@ -86,6 +86,3 @@ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -std=c++11")
 add_subdirectory(source)
 
 add_subdirectory(tests)
-
-
-

cmake_modules/FindnetCDF.cmake

@@ -0,0 +1,93 @@
+#[==[
+Provides the following variables:
+
+  * `NetCDF_FOUND`: Whether NetCDF was found or not.
+  * `NetCDF_INCLUDE_DIRS`: Include directories necessary to use NetCDF.
+  * `NetCDF_LIBRARIES`: Libraries necessary to use NetCDF.
+  * `NetCDF_VERSION`: The version of NetCDF found.
+  * `NetCDF::NetCDF`: A target to use with `target_link_libraries`.
+Adapted from https://github.com/Kitware/VTK/blob/master/CMake/FindNetCDF.cmake
+Downloaded 10/29/2019
+#]==]
+
+# Try to find a CMake-built NetCDF.
+message(STATUS "Searching for NetCDF...")
+find_package(netCDF CONFIG QUIET)
+if (netCDF_FOUND)
+  # Forward the variables in a consistent way.
+  set(NetCDF_FOUND "${netCDF_FOUND}")
+  set(NetCDF_INCLUDE_DIRS "${netCDF_INCLUDE_DIR}")
+  set(NetCDF_LIBRARIES "${netCDF_LIBRARIES}")
+  set(NetCDF_VERSION "${NetCDFVersion}")
+  if (NOT TARGET NetCDF::NetCDF)
+    add_library(NetCDF::NetCDF INTERFACE IMPORTED)
+    set_target_properties(NetCDF::NetCDF PROPERTIES
+      INTERFACE_LINK_LIBRARIES "${NetCDF_LIBRARIES}")
+  endif ()
+  # Skip the rest of the logic in this file.
+  return ()
+endif ()
+
+message(STATUS "Searching for PkgConfig...")
+find_package(PkgConfig QUIET)
+if (PkgConfig_FOUND)
+  pkg_check_modules(_NetCDF QUIET netcdf IMPORTED_TARGET)
+  if (_NetCDF_FOUND)
+    # Forward the variables in a consistent way.
+    set(NetCDF_FOUND "${_NetCDF_FOUND}")
+    set(NetCDF_INCLUDE_DIRS "${_NetCDF_INCLUDE_DIRS}")
+    set(NetCDF_LIBRARIES "${_NetCDF_LIBRARIES}")
+    set(NetCDF_VERSION "${_NetCDF_VERSION}")
+    if (NOT TARGET NetCDF::NetCDF)
+      add_library(NetCDF::NetCDF INTERFACE IMPORTED)
+      set_target_properties(NetCDF::NetCDF PROPERTIES
+        INTERFACE_LINK_LIBRARIES "PkgConfig::_NetCDF")
+    endif ()
+    message(STATUS "NetCDF_LIBRARIES: ${NetCDF_LIBRARIES}")
+    # Skip the rest of the logic in this file.
+    return ()
+  endif ()
+endif ()
+
+message(STATUS "Searching for path to NetCDF include...")
+find_path(NetCDF_INCLUDE_DIR
+  NAMES netcdf.h
+  DOC "netcdf include directories")
+mark_as_advanced(NetCDF_INCLUDE_DIR)
+
+find_library(NetCDF_LIBRARY
+  NAMES netcdf
+  DOC "netcdf library")
+mark_as_advanced(NetCDF_LIBRARY)
+
+if (NetCDF_INCLUDE_DIR)
+  file(STRINGS "${NetCDF_INCLUDE_DIR}/netcdf_meta.h" _netcdf_version_lines
+    REGEX "#define[ \t]+NC_VERSION_(MAJOR|MINOR|PATCH|NOTE)")
+  string(REGEX REPLACE ".*NC_VERSION_MAJOR *\([0-9]*\).*" "\\1" _netcdf_version_major "${_netcdf_version_lines}")
+  string(REGEX REPLACE ".*NC_VERSION_MINOR *\([0-9]*\).*" "\\1" _netcdf_version_minor "${_netcdf_version_lines}")
+  string(REGEX REPLACE ".*NC_VERSION_PATCH *\([0-9]*\).*" "\\1" _netcdf_version_patch "${_netcdf_version_lines}")
+  string(REGEX REPLACE ".*NC_VERSION_NOTE *\"\([^\"]*\)\".*" "\\1" _netcdf_version_note "${_netcdf_version_lines}")
+  set(NetCDF_VERSION "${_netcdf_version_major}.${_netcdf_version_minor}.${_netcdf_version_patch}${_netcdf_version_note}")
+  unset(_netcdf_version_major)
+  unset(_netcdf_version_minor)
+  unset(_netcdf_version_patch)
+  unset(_netcdf_version_note)
+  unset(_netcdf_version_lines)
+endif ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(NetCDF
+  REQUIRED_VARS NetCDF_LIBRARY NetCDF_INCLUDE_DIR
+  VERSION_VAR NetCDF_VERSION)
+
+if (NetCDF_FOUND)
+  set(NetCDF_INCLUDE_DIRS "${NetCDF_INCLUDE_DIR}")
+  set(NetCDF_LIBRARIES "${NetCDF_LIBRARY}")
+  message(STATUS "NetCDF libraries: ${NetCDF_LIBRARIES}")
+  if (NOT TARGET NetCDF::NetCDF)
+    add_library(NetCDF::NetCDF UNKNOWN IMPORTED)
+    set_target_properties(NetCDF::NetCDF PROPERTIES
+      IMPORTED_LOCATION "${NetCDF_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${NetCDF_INCLUDE_DIR}")
+  endif ()
+endif ()

scripts/cades_condo_cmake_2d

@@ -11,7 +11,6 @@ cmake -DCMAKE_CXX_COMPILER=mpiCC -DCMAKE_C_COMPILER=mpicc \
         -DSAMRAI_DIR=$PWD/or-condo-login-mpiCC-mpif77-opt/base/SAMRAI \
         -DHYPRE_DIR=$HOME/hypre/hypre-2.11.1/src/hypre \
         -DSUNDIALS_DIR=$PWD/or-condo-login-mpiCC-mpif77-opt/base/sundials \
-        -DNETCDF_DIR=$NETCDF_DIR \
         -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF \
         -DNDIM="2" \
         ..

scripts/cades_condo_cmake_3d

@@ -11,7 +11,6 @@ cmake -DCMAKE_CXX_COMPILER=mpiCC -DCMAKE_C_COMPILER=mpicc \
         -DSAMRAI_DIR=$PWD/or-condo-login-mpiCC-mpif77-opt/base/SAMRAI \
         -DHYPRE_DIR=$HOME/hypre/hypre-2.11.1/src/hypre \
         -DSUNDIALS_DIR=$PWD/or-condo-login-mpiCC-mpif77-opt/base/sundials \
-        -DNETCDF_DIR=$NETCDF_DIR \
         -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF \
         -DNDIM="3" \
         ..

scripts/quartz_cmake

@@ -12,8 +12,8 @@ cmake -DCMAKE_CXX_COMPILER=mpic++ -DCMAKE_C_COMPILER=mpicc \
         -DSAMRAI_DIR=$PWD/quartz-mpic++-mpif77-opt/base/SAMRAI \
         -DHYPRE_DIR=/usr/gapps/phasefield/hypre/2.15.0 \
         -DSUNDIALS_DIR=$PWD/quartz-mpic++-mpif77-opt/base/sundials \
-        -DNETCDF_DIR=/usr/gapps/phasefield/lib/netcdf-cxx-intel \
         -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF \
+        -DCMAKE_PREFIX_PATH=/usr/gapps/phasefield/lib/netcdf-cxx-intel \
         -DNDIM="2" \
         ..