Update feature/capgen from main 2022/01/09

.travis.yml

@@ -22,7 +22,6 @@ script:
 notifications:
   email:
     recipients:
-      - [email protected]
       - [email protected]
       - [email protected]
     on_success: always # default: change

CMakeLists.txt

@@ -1,90 +1,44 @@
-# Set default project to unknown
-if(NOT PROJECT)
-  message(STATUS "Setting CCPP project to 'unknown' as none was specified.")
-  set(PROJECT "Unknown")
-endif (NOT PROJECT)
-
-#------------------------------------------------------------------------------
 cmake_minimum_required(VERSION 3.0)
 
 project(ccpp_framework
         VERSION 5.0.0
         LANGUAGES Fortran)
 
-# Use rpaths on MacOSX
-set(CMAKE_MACOSX_RPATH 1)
-if(POLICY CMP0042)
-    cmake_policy(SET CMP0042 NEW)
-endif(POLICY CMP0042)
-
 #------------------------------------------------------------------------------
 # Set package definitions
 set(PACKAGE "ccpp-framework")
 set(AUTHORS "Dom Heinzeller" "Grant Firl" "Laurie Carson")
 string(TIMESTAMP YEAR "%Y")
 
-#------------------------------------------------------------------------------
-# CMake Modules
-# Set the CMake module path
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
 #------------------------------------------------------------------------------
 # Set OpenMP flags for C/C++/Fortran
 if (OPENMP)
-  include(detect_openmp)
-  detect_openmp()
+  find_package(OpenMP REQUIRED)
   set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}")
-  message(STATUS "Enable OpenMP support")
-else (OPENMP)
-  message (STATUS "Disable OpenMP support")
 endif (OPENMP)
 
 #------------------------------------------------------------------------------
 # Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    # DH* TODO - TRY TO CHANGE THIS TO RELEASE AND SEE WHAT HAPPENS TO THE RESULTS
     message(STATUS "Setting build type to 'Debug' as none was specified.")
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
-
+    # *DH
     # Set the possible values of build type for cmake-gui
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "Coverage")
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Bitforbit" "Release" "Coverage")
 endif()
 
 #------------------------------------------------------------------------------
-# Request a static build
-option(BUILD_SHARED_LIBS "Build a static library" OFF)
-
-#------------------------------------------------------------------------------
-# Enable code coverage
-if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND (CMAKE_BUILD_TYPE STREQUAL "Coverage"))
-    include(code_coverage)
-    list(APPEND LIBS "gcov")
+# Pass debug/release flag to Fortran files for preprocessor
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_definitions(-DDEBUG)
 endif()
 
 #------------------------------------------------------------------------------
-# Enable testing
-enable_testing()
+# Request a static build
+option(BUILD_SHARED_LIBS "Build a static library" OFF)
 
 #------------------------------------------------------------------------------
 # Add the sub-directories
-# Source
 add_subdirectory(src)
-# Documentation
 add_subdirectory(doc)
-
-#------------------------------------------------------------------------------
-# Configure and enable packaging
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Common Community Physics Package - Framework")
-set(CPACK_PACKAGE_VENDOR "DTC NOAA/NCAR")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-set(CPACK_PACKAGE_INSTALL_DIRECTORY
-    "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_SOURCE_GENERATOR "TBZ2")
-set(CPACK_GENERATOR "TBZ2")
-
-include(CPack)