Merge pull request #11 from swig-fortran/minor-cmake

Minor CMake updates/fixes

Author: sethrj

CMakeLists.txt

@@ -48,7 +48,7 @@ if (FLIBCPP_FORTRAN_STD AND NOT FLIBCPP_FORTRAN_STD STREQUAL "none")
       "FLIBCPP_FORTRAN_STD=${FLIBCPP_FORTRAN_STD}. Configure with "
       "the FFLAGS environment variable or explicitly specify "
       "CMAKE_Fortran_FLAGS")
-    set(_FLIBCPP_STD_FLAGS "none" CACHE FORCE STRING "")
+    set(FLIBCPP_FORTRAN_STD "none" CACHE FORCE STRING "")
   endif()
 endif()
 
@@ -84,6 +84,8 @@ if (FLIBCPP_USE_SWIG AND SWIG_FOUND)
     cmake_policy(SET CMP0086 "NEW")
     include(UseSWIG)
   endif()
+  set(FLIBCPP_SWIG_EXECUTABLE "${SWIG_EXECUTABLE}")
+  set(FLIBCPP_SWIG_DIR        "${SWIG_DIR}")
 else()
   set(FLIBCPP_USE_SWIG FALSE)
 endif()
@@ -102,7 +104,7 @@ set(FLIBCPP_INTERFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
 set(FLIBCPP_GENERATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(FLIBCPP_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Flibcpp")
 set(FLIBCPP_INSTALL_MODULEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
-set(FLIBCPP_NAMESPACE Flibcpp::)
+set(FLIBCPP_NAMESPACE "Flibcpp::")
 
 # List of libraries exported by cmake/FlibcppConfig.cmake.in
 set(FLIBCPP_LIBRARIES)
@@ -158,6 +160,7 @@ function(flibcpp_add_module name)
       cxx_std_11
   )
   if (_FLIBCPP_STD_FLAGS)
+    # Compile Fortran code with a particular standard
     target_compile_options(${name}
       PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:${_FLIBCPP_STD_FLAGS}>
     )

cmake/CheckSWIGFortran.cmake

@@ -16,7 +16,7 @@ if (NOT SWIG_CHECKED_FORTRAN)
   if (NOT SWIG_help_output MATCHES "Fortran")
     message(FATAL_ERROR "This version of SWIG does not support Fortran "
       "wrapping. Please install the version from "
-      "https://github.com/sethrj/swig")
+      "https://github.com/swig-fortran/swig")
   endif()
   set(SWIG_CHECKED_FORTRAN TRUE CACHE INTERNAL "")
 endif()

cmake/FlibcppConfig.cmake.in

@@ -9,9 +9,13 @@ endif()
 
 set(Flibcpp_LIBRARIES @FLIBCPP_LIBRARIES@)
 
-set(Flibcpp_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+set(FLIBCPP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+set(FLIBCPP_USE_SWIG          @FLIBCPP_USE_SWIG@)
+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)