Superficial cmake tweaks

Author: sethrj

.gitignore

@@ -1,4 +1,5 @@
 /build/
+/build-*/
 # Prerequisites
 *.d
 

CMakeLists.txt

@@ -114,8 +114,7 @@ function(swig_fortran_add_module name)
   # We're using C++
   set_property(SOURCE src/${name}.i PROPERTY CPLUSPLUS ON)
   # We need to include the source directory
-  set_property(SOURCE src/${name}.i
-    PROPERTY USE_TARGET_INCLUDE_DIRECTORIES ON)
+  set_property(SOURCE src/${name}.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES ON)
 
   if (FLIBCPP_USE_SWIG)
     # SWIG is available; actually generate the library dynamically.
@@ -124,41 +123,44 @@ function(swig_fortran_add_module name)
       LANGUAGE Fortran
       TYPE USE_BUILD_SHARED_LIBS
       OUTPUT_DIR "${FLIBCPP_GENERATE_DIR}"
-      SOURCES src/${name}.i ${ARGN})
+      SOURCES src/${name}.i ${ARGN}
+    )
   else()
     # SWIG is *not* being used: compile the code committed in the repository,
     # generated by the developer with SWIG.
     add_library(${name}
       "${FLIBCPP_GENERATE_DIR}/${name}.f90"
       "${FLIBCPP_GENERATE_DIR}/${name}FORTRAN_wrap.cxx"
-      ${ARGN})
+      ${ARGN}
+    )
   endif()
 
   # Enable C++11
-  target_compile_features(${name} PRIVATE cxx_std_11)
-
-  # Use correct include directories for C++
-  target_include_directories(${name}
-      PRIVATE
-          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+  target_compile_features(${name}
+    PRIVATE
+      cxx_std_11
   )
 
-  # Use correct Fortran module directories
   target_include_directories(${name}
-      PUBLIC
-          $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
-          $<INSTALL_INTERFACE:${FLIBCPP_INSTALL_MODULEDIR}>
+    PRIVATE
+      # Internal C++ headers
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+    PUBLIC
+      # Fortran modules
+      $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
+      $<INSTALL_INTERFACE:${FLIBCPP_INSTALL_MODULEDIR}>
   )
 
   # Set up installation
   install(TARGETS ${name}
-      EXPORT Flibcpp-targets
-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    EXPORT Flibcpp-targets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   # Add to list of targets to export
   set(FLIBCPP_LIBRARIES ${FLIBCPP_LIBRARIES} ${FLIBCPP_NAMESPACE}${name}
-      PARENT_SCOPE)
+      PARENT_SCOPE
+  )
 endfunction()
 
 # Four SWIG libraries
@@ -174,7 +176,8 @@ target_link_libraries(flc_algorithm flc_random flc)
 
 # Install module files
 install(DIRECTORY "${CMAKE_Fortran_MODULE_DIRECTORY}/"
-  DESTINATION "${FLIBCPP_INSTALL_MODULEDIR}")
+  DESTINATION "${FLIBCPP_INSTALL_MODULEDIR}"
+)
 
 install(EXPORT Flibcpp-targets
   FILE FlibcppTargets.cmake
@@ -189,19 +192,19 @@ configure_package_config_file(
   ${CMAKE_CURRENT_LIST_DIR}/cmake/FlibcppConfig.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/FlibcppConfig.cmake
   INSTALL_DESTINATION ${FLIBCPP_INSTALL_CONFIGDIR}
-  )
+)
 
 write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/FlibcppConfigVersion.cmake
   VERSION ${PROJECT_VERSION}
   COMPATIBILITY SameMajorVersion
-  )
+)
 
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/FlibcppConfig.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/FlibcppConfigVersion.cmake
   DESTINATION ${FLIBCPP_INSTALL_CONFIGDIR}
-  )
+)
 
 #---------------------------------------------------------------------------#
 # TESTING

scripts/cmake_sputnik renamed to scripts/cmake_vostok

@@ -7,13 +7,10 @@ cd $BUILD
 
 cmake \
   -G Ninja \
-  -D CMAKE_CXX_COMPILER="/opt/local/bin/g++" \
-  -D CMAKE_C_COMPILER="/opt/local/bin/gcc" \
-  -D CMAKE_Fortran_COMPILER="/opt/local/bin/gfortran" \
+  -D FLIBCPP_DEV=ON \
   -D SWIG_EXECUTABLE="/rnsdhpc/code/build/swig-debug/swig"  \
   -D SWIG_DIR="/rnsdhpc/code/src/swig/Lib" \
   -D BUILD_SHARED_LIBS=ON \
-  -D CMAKE_BUILD_TYPE=Debug \
   -D CMAKE_Fortran_FLAGS="-Wall -Wextra -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals -std=f2003" \
   -D CMAKE_CXX_FLAGS="-Wall -Wextra" \
   $SOURCE