Minor cmake changes (#21)

* Normalize CMakeLists spacing

* Suppress version output

Author: sethrj

CMakeLists.txt

@@ -10,7 +10,6 @@ cmake_minimum_required(VERSION 3.8)
 # Determine version number from git metadata
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/FlibcppVersion.cmake")
 flibcpp_find_version(Flibcpp "${CMAKE_CURRENT_LIST_DIR}/cmake/git-version.txt")
-message(STATUS "Flibcpp version: ${Flibcpp_VERSION}")
 
 project(Flibcpp VERSION "${Flibcpp_VERSION}" LANGUAGES CXX Fortran)
 
@@ -22,17 +21,17 @@ option(FLIBCPP_DEV "Default to using development-centered options" OFF)
 option(FLIBCPP_BUILD_DOCS "Build documentation with Sphinx" ${FLIBCPP_DEV})
 option(FLIBCPP_USE_SWIG "Regenerate source files using SWIG" ${FLIBCPP_DEV})
 
-if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   set(_DEFAULT_BUILD_EXAMPLES ON)
 endif()
 option(FLIBCPP_BUILD_EXAMPLES "Build examples" ${_DEFAULT_BUILD_EXAMPLES})
 
-if (FLIBCPP_DEV)
+if(FLIBCPP_DEV)
   set(_DEFAULT_BUILD_TESTS ON)
 endif()
 option(FLIBCPP_BUILD_TESTS "Build Flibcpp tests" ${_DEFAULT_BUILD_TESTS})
 
-if (FLIBCPP_BUILD_TESTS OR FLIBCPP_BUILD_EXAMPLES)
+if(FLIBCPP_BUILD_TESTS OR FLIBCPP_BUILD_EXAMPLES)
   set(_DEFAULT_BUILD_TESTING ON)
 endif()
 option(BUILD_TESTING "Enable CTest" ${_DEFAULT_BUILD_TESTING})
@@ -44,10 +43,10 @@ option(BUILD_TESTING "Enable CTest" ${_DEFAULT_BUILD_TESTING})
 # Fortran standard
 set(FLIBCPP_FORTRAN_STD "03" CACHE STRING
    "Fortran standard for compiling generated code (options: 03/08/15/18/none)")
-if (FLIBCPP_FORTRAN_STD AND NOT FLIBCPP_FORTRAN_STD STREQUAL "none")
-  if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+if(FLIBCPP_FORTRAN_STD AND NOT FLIBCPP_FORTRAN_STD STREQUAL "none")
+  if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
     set(_FLIBCPP_STD_FLAGS "-std=f20${FLIBCPP_FORTRAN_STD}")
-  elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
     set(_FLIBCPP_STD_FLAGS "-std${FLIBCPP_FORTRAN_STD}")
   else()
     message(WARNING "Fortran standard flags are not known for "
@@ -60,8 +59,8 @@ if (FLIBCPP_FORTRAN_STD AND NOT FLIBCPP_FORTRAN_STD STREQUAL "none")
 endif()
 
 # Build type
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  if (FLIBCPP_DEV)
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  if(FLIBCPP_DEV)
     set(_CMAKE_BUILD_TYPE "Debug")
   else ()
     set(_CMAKE_BUILD_TYPE "RelWithDebInfo")
@@ -75,25 +74,25 @@ endif()
 #---------------------------------------------------------------------------#
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-if (CMAKE_VERSION VERSION_LESS 3.18)
+if(CMAKE_VERSION VERSION_LESS 3.18)
   list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/backport-cmake-318")
 endif()
 
-if (FLIBCPP_USE_SWIG)
+if(FLIBCPP_USE_SWIG)
   find_package(SWIG COMPONENTS fortran REQUIRED)
 
-  if (CMAKE_VERSION VERSION_LESS 3.12)
+  if(CMAKE_VERSION VERSION_LESS 3.12)
     message(FATAL_ERROR "CMake 3.12 or higher is required to regenerate the "
       "Fortran bindings using SWIG. Set FLIBCPP_USE_SWIG to OFF "
       "and reconfigure.")
   endif()
 
-  if (CMAKE_VERSION GREATER_EQUAL 3.13)
+  if(CMAKE_VERSION GREATER_EQUAL 3.13)
     cmake_policy(SET CMP0078 "NEW")
   else()
     set(FLIBCPP_CMP0078 "NEW")
   endif()
-  if (CMAKE_VERSION GREATER_EQUAL 3.14)
+  if(CMAKE_VERSION GREATER_EQUAL 3.14)
     cmake_policy(SET CMP0086 "NEW")
   else()
     set(FLIBCPP_CMP0086 "NEW")
@@ -121,7 +120,7 @@ set(FLIBCPP_NAMESPACE "Flibcpp::")
 set(FLIBCPP_LIBRARIES)
 
 function(flibcpp_add_module name)
-  if (FLIBCPP_USE_SWIG)
+  if(FLIBCPP_USE_SWIG)
     # SWIG is available; actually generate the library dynamically.
 
     set(src_file "${FLIBCPP_INTERFACE_DIR}/${name}.i")
@@ -173,7 +172,7 @@ function(flibcpp_add_module name)
   # Compile with e.g. std=c++11 instead of =gnu++11
   set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF)
 
-  if (_FLIBCPP_STD_FLAGS)
+  if(_FLIBCPP_STD_FLAGS)
     # Compile Fortran code with a particular standard
     target_compile_options(${name}
       PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:${_FLIBCPP_STD_FLAGS}>
@@ -207,7 +206,7 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/cmake/flibcpp_version.cpp.in"
 flibcpp_add_module(flc "${FLIBCPP_VERSION_CPP}")
 
 # Also install 'import_flc' if using SWIG
-if (FLIBCPP_USE_SWIG)
+if(FLIBCPP_USE_SWIG)
   install(FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/include/import_flc.i"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
@@ -273,15 +272,15 @@ install(FILES
 # TESTING AND DOCS
 #---------------------------------------------------------------------------#
 
-if (FLIBCPP_BUILD_TESTS)
+if(FLIBCPP_BUILD_TESTS)
   add_subdirectory(test)
 endif()
 
-if (FLIBCPP_BUILD_EXAMPLES)
+if(FLIBCPP_BUILD_EXAMPLES)
   add_subdirectory(example)
 endif()
 
-if (FLIBCPP_BUILD_DOCS)
+if(FLIBCPP_BUILD_DOCS)
   add_subdirectory(doc)
 endif()
 

cmake/FlibcppConfig.cmake.in

@@ -3,7 +3,7 @@ include(CMakeFindDependencyMacro)
 
 list(APPEND CMAKE_MODULE_PATH ${Flibcpp_CMAKE_DIR})
 
-if (NOT TARGET @FLIBCPP_NAMESPACE@flc)
+if(NOT TARGET @FLIBCPP_NAMESPACE@flc)
   include("${Flibcpp_CMAKE_DIR}/FlibcppTargets.cmake")
 endif()
 
@@ -15,7 +15,7 @@ set(FLIBCPP_FORTRAN_STD       @FLIBCPP_FORTRAN_STD@)
 set(FLIBCPP_SWIG_EXECUTABLE   @FLIBCPP_SWIG_EXECUTABLE@)
 set(FLIBCPP_SWIG_DIR          @FLIBCPP_SWIG_DIR@)
 
-if (NOT FLIBCPP_BUILD_SHARED_LIBS)
+if(NOT FLIBCPP_BUILD_SHARED_LIBS)
   # Downstream libraries must find and link to the C++ runtimes themselves since
   # they can't use the shared library dependencies
   enable_language(CXX)

cmake/FlibcppVersion.cmake

@@ -31,7 +31,7 @@ FlibcppVersion
 
 #]=======================================================================]
 
-if (CMAKE_SCRIPT_MODE_FILE)
+if(CMAKE_SCRIPT_MODE_FILE)
   cmake_minimum_required(VERSION 3.8)
 endif()
 
@@ -40,11 +40,11 @@ function(flibcpp_find_version PROJNAME GIT_VERSION_FILE)
   # .gitattributes file)
   file(STRINGS "${GIT_VERSION_FILE}" _TEXTFILE)
 
-  if (_TEXTFILE MATCHES "\\$Format:")
+  if(_TEXTFILE MATCHES "\\$Format:")
     # Not a "git archive": use live git information
     set(_CACHE_VAR "${PROJNAME}_GIT_DESCRIBE")
     set(_CACHED_VERSION "${${_CACHE_VAR}}")
-    if (NOT _CACHED_VERSION)
+    if(NOT _CACHED_VERSION)
       # Building from a git checkout rather than a distribution
       find_package(Git QUIET REQUIRED)
       execute_process(
@@ -55,26 +55,26 @@ function(flibcpp_find_version PROJNAME GIT_VERSION_FILE)
         RESULT_VARIABLE _GIT_RESULT
         OUTPUT_STRIP_TRAILING_WHITESPACE
       )
-      if (NOT _GIT_RESULT EQUAL "0")
+      if(NOT _GIT_RESULT EQUAL "0")
         message(WARNING "Failed to get ${PROJNAME} version from git: "
           "${_GIT_ERR}")
-      elseif (NOT _VERSION_STRING)
+      elseif(NOT _VERSION_STRING)
         message(WARNING "Failed to get ${PROJNAME} version from git: "
           "git describe returned an empty string")
       else()
         # Process description tag: e.g. v0.4.0-2-gc4af497 or v0.4.0
         string(REGEX MATCH "v([0-9.]+)(-[0-9]+-g([0-9a-f]+))?" _MATCH
           "${_VERSION_STRING}"
         )
-        if (_MATCH)
+        if(_MATCH)
           set(_VERSION_STRING "${CMAKE_MATCH_1}")
-          if (CMAKE_MATCH_2)
+          if(CMAKE_MATCH_2)
             # *not* a tagged release
             set(_VERSION_HASH "${CMAKE_MATCH_3}")
           endif()
         endif()
       endif()
-      if (NOT _VERSION_STRING)
+      if(NOT _VERSION_STRING)
         execute_process(
           COMMAND "${GIT_EXECUTABLE}" "log" "-1" "--format=%h" "HEAD"
           WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
@@ -92,25 +92,25 @@ function(flibcpp_find_version PROJNAME GIT_VERSION_FILE)
     # First line are decorators, second is hash.
     list(GET _TEXTFILE 0 _TAG)
     string(REGEX MATCH "tag: *v([0-9.]+)" _MATCH "${_TAG}")
-    if (_MATCH)
+    if(_MATCH)
       set(_VERSION_STRING "${CMAKE_MATCH_1}")
     else()
       # *not* a tagged release
       list(GET _TEXTFILE 1 _HASH)
       string(REGEX MATCH " *([0-9a-f]+)" _MATCH "${_HASH}")
-      if (_MATCH)
+      if(_MATCH)
         set(_VERSION_HASH "${CMAKE_MATCH_1}")
       endif()
     endif()
   endif()
 
-  if (NOT _VERSION_STRING)
+  if(NOT _VERSION_STRING)
     message(WARNING "Could not determine version number for ${PROJNAME}: "
       "perhaps a non-release archive?")
     set(_VERSION_STRING "0.0.0")
   endif()
 
-  if (_VERSION_HASH)
+  if(_VERSION_HASH)
     set(_FULL_VERSION_STRING "v${_VERSION_STRING}+${_VERSION_HASH}")
   else()
     set(_FULL_VERSION_STRING "v${_VERSION_STRING}")
@@ -120,9 +120,9 @@ function(flibcpp_find_version PROJNAME GIT_VERSION_FILE)
   set(${PROJNAME}_VERSION_STRING "${_FULL_VERSION_STRING}" PARENT_SCOPE)
 endfunction()
 
-if (CMAKE_SCRIPT_MODE_FILE)
+if(CMAKE_SCRIPT_MODE_FILE)
   # This script is being run from the command line. Useful for debugging.
-  if (NOT DEFINED GIT_VERSION_FILE)
+  if(NOT DEFINED GIT_VERSION_FILE)
     message(FATAL_ERROR "Run this script with "
       "cmake -D GIT_VERSION_FILE=git-version.txt -P FlibcppVersion.cmake")
   endif()