Update SWIG version and other minor cmake changes (#24)

sethrj · web-flow · commit 4661170ec49d · 2020-11-22T12:53:51.000-05:00
* Fix standalone version script

* Add cmake policy to silence warnings and update build script

* Regenerate code with SWIG 4.0.2+fortran release

* Update travis yaml definitions
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,25 @@
 dist: bionic
-sudo: required # apt-get done in before_install.sh
-language: minimal
+language: shell
+os: linux
 
 # Only build master or PRs merging into master
 branches:
   only:
   - master
 
 # List of configurations to check
-matrix:
+jobs:
   include:
-    - os: linux
-      env: FLIBCPP_DEV=ON GENERATOR=ninja
+    - env: FLIBCPP_DEV=ON GENERATOR=ninja
       addons:
         apt:
           packages:
           - python3-sphinx
           - valgrind
-    - os: linux
-      env: FLIBCPP_DEV=OFF GENERATOR=make
+    - env: FLIBCPP_DEV=OFF GENERATOR=make
            FLIBCPP_FORTRAN_STD=03
            GCC_VERSION=8
-    - os: linux
-      env: FLIBCPP_DEV=OFF GENERATOR=make
+    - env: FLIBCPP_DEV=OFF GENERATOR=make
            FLIBCPP_FORTRAN_STD=08
            GCC_VERSION=9
 # Build phases
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/FlibcppVersion.cmake")
 flibcpp_find_version(Flibcpp "${CMAKE_CURRENT_LIST_DIR}/cmake/git-version.txt")
 
 project(Flibcpp VERSION "${Flibcpp_VERSION}" LANGUAGES CXX Fortran)
+cmake_policy(VERSION 3.8...3.19)
 
 #---------------------------------------------------------------------------#
 # OPTIONS
@@ -34,7 +35,6 @@ option(FLIBCPP_BUILD_TESTS "Build Flibcpp tests" ${_DEFAULT_BUILD_TESTS})
 if(FLIBCPP_BUILD_TESTS OR FLIBCPP_BUILD_EXAMPLES)
   set(_DEFAULT_BUILD_TESTING ON)
 endif()
-option(BUILD_TESTING "Enable CTest" ${_DEFAULT_BUILD_TESTING})
 
 #---------------------------------------------------------------------------#
 # FLAGS
@@ -102,8 +102,10 @@ if(FLIBCPP_USE_SWIG)
   include(UseSWIG)
 endif()
 
-# Enable testing based on BUILD_TESTING flag
-include(CTest)
+# Load CTest if applicable
+if(FLIBCPP_BUILD_TESTS OR FLIBCPP_BUILD_EXAMPLES)
+  include(CTest)
+endif()
 
 #---------------------------------------------------------------------------#
 # LIBRARY
diff --git a/cmake/FlibcppVersion.cmake b/cmake/FlibcppVersion.cmake
@@ -126,7 +126,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
     message(FATAL_ERROR "Run this script with "
       "cmake -D GIT_VERSION_FILE=git-version.txt -P FlibcppVersion.cmake")
   endif()
-  flibcpp_find_version(local ${GIT_VERSION_FILE})
+  flibcpp_find_version(LOCAL ${GIT_VERSION_FILE})
   message(STATUS "${LOCAL_VERSION}")
   message(STATUS "${LOCAL_VERSION_STRING}")
 endif()
diff --git a/scripts/build/vostok.sh b/scripts/build/vostok.sh
@@ -9,14 +9,16 @@ cd ${BUILD}
 CMAKE=cmake
 ${CMAKE} --version
 
+# NOTE: gcc 10.2 incorrectly warns about logical conversions, see
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96319
+module load swig/4.0.2-fortran gcc/10
+
 ${CMAKE} \
   -G Ninja \
   -D FLIBCPP_DEV=ON \
-  -D SWIG_EXECUTABLE="/rnsdhpc/code/_build/swig-debug/swig"  \
-  -D SWIG_DIR="/rnsdhpc/code/swig/Lib" \
   -D BUILD_SHARED_LIBS=ON \
-  -D CMAKE_Fortran_FLAGS="-Wall -Wextra -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals" \
-  -D CMAKE_CXX_FLAGS="-Wall -Wextra -pedantic" \
+  -D CMAKE_Fortran_FLAGS="-Wall -Wextra -pedantic -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals" \
+  -D CMAKE_CXX_FLAGS="-Wall -Wextra -pedantic -Werror" \
   -D CMAKE_INSTALL_PREFIX="${PREFIX}" \
   ${SOURCE}
 ninja -v
diff --git a/src/flc.f90 b/src/flc.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flcFORTRAN_wrap.cxx b/src/flcFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
diff --git a/src/flc_algorithm.f90 b/src/flc_algorithm.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flc_algorithmFORTRAN_wrap.cxx b/src/flc_algorithmFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
diff --git a/src/flc_map.f90 b/src/flc_map.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flc_mapFORTRAN_wrap.cxx b/src/flc_mapFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
diff --git a/src/flc_random.f90 b/src/flc_random.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flc_randomFORTRAN_wrap.cxx b/src/flc_randomFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
diff --git a/src/flc_set.f90 b/src/flc_set.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flc_setFORTRAN_wrap.cxx b/src/flc_setFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
diff --git a/src/flc_string.f90 b/src/flc_string.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flc_stringFORTRAN_wrap.cxx b/src/flc_stringFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
diff --git a/src/flc_vector.f90 b/src/flc_vector.f90
@@ -1,5 +1,5 @@
 ! This file was automatically generated by SWIG (http://www.swig.org).
-! Version 4.0.2
+! Version 4.0.2+fortran
 !
 ! Do not make changes to this file unless you know what you are doing--modify
 ! the SWIG interface file instead.
diff --git a/src/flc_vectorFORTRAN_wrap.cxx b/src/flc_vectorFORTRAN_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
+ * Version 4.0.2+fortran
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -604,7 +604,7 @@ typedef struct {
 } SwigComplex_double;
 }
 
-SwigComplex_double SWIG_create_complex_double(double real, double imag) {
+SWIGINTERN SwigComplex_double SWIG_create_complex_double(double real, double imag) {
   SwigComplex_double result;
   result.real = real;
   result.imag = imag;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`! This file was automatically generated by SWIG (http://www.swig.org).`
`2`		`-! Version 4.0.2`
	`2`	`+! Version 4.0.2+fortran`
`3`	`3`	`!`
`4`	`4`	`! Do not make changes to this file unless you know what you are doing--modify`
`5`	`5`	`! the SWIG interface file instead.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* ----------------------------------------------------------------------------`
`2`	`2`	`* This file was automatically generated by SWIG (http://www.swig.org).`
`3`		`- * Version 4.0.2`
	`3`	`+ * Version 4.0.2+fortran`
`4`	`4`	`*`
`5`	`5`	`* This file is not intended to be easily readable and contains a number of`
`6`	`6`	`* coding conventions designed to improve portability and efficiency. Do not make`