Update Autocmake (#89)

* Update Autocmake

* Update license headers

* Update CFlags and CXXFlags

* Fix more CMake errors

* Fix compilation of Python bindings

Author: robertodr

.gitattributes

@@ -17,3 +17,6 @@ src/taylor/*.cpp !licensefile
 
 python/init.py licensefile=.githooks/LICENSE-Python
 python/xcfun.py licensefile=.githooks/LICENSE-Python
+
+cmake/update.py !licensefile
+cmake/autocmake/*.py !licensefile

CMakeLists.txt

@@ -1,5 +1,5 @@
 # This file is autogenerated by Autocmake v1.0.0-alpha-x http://autocmake.org
-# Copyright (c) 2015-2018 by Radovan Bast, Roberto Di Remigio, Jonas Juselius, and contributors.
+# Copyright (c) 2015-2019 by Radovan Bast, Roberto Di Remigio, Jonas Juselius, and contributors.
 
 # set minimum cmake version
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
@@ -49,22 +49,17 @@ macro(option_with_default variable msge default)
   endif()
 endmacro()
 
-# directories which hold included cmake modules
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/custom)
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/custom/compilers)
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/downloaded)
-
 # included cmake modules
-include(autocmake_custom_color_messages)
-include(autocmake_default_build_paths)
-include(autocmake_safeguards)
-include(autocmake_cxx)
-include(autocmake_cc)
-include(fc_optional)
-include(code_coverage)
-include(CXXFlags)
-include(CFlags)
-include(static_library)
-include(xcfun)
-include(autocmake_src)
-include(test)
+include(${PROJECT_SOURCE_DIR}/cmake/downloaded/autocmake_custom_color_messages.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/downloaded/autocmake_default_build_paths.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/downloaded/autocmake_safeguards.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/downloaded/autocmake_cxx.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/downloaded/autocmake_cc.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/fc_optional.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/code_coverage.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/compilers/CXXFlags.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/compilers/CFlags.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/static_library.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/xcfun.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/downloaded/autocmake_src.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/custom/test.cmake)

Pipfile

@@ -7,11 +7,11 @@ name = "pypi"
 
 [packages]
 
-Sphinx = "*"
-sphinx_rtd_theme = "*"
-fprettify = "*"
 numpy = "*"
 
 
 [dev-packages]
 
+Sphinx = "*"
+sphinx_rtd_theme = "*"
+fprettify = "*"

Pipfile.lock

@@ -187,23 +187,13 @@ def gen_cmakelists(project_name, project_language, min_cmake_version, default_bu
 
     s.append(gen_cmake_options_wrappers())
 
-    if len(modules) > 0:
-        s.append('\n# directories which hold included cmake modules')
-
-    module_paths = [module.path for module in modules]
-    module_paths.append('downloaded')  # this is done to be able to find fetched modules when testing
-    module_paths = list(set(module_paths))
-    module_paths.sort()  # we do this to always get the same order and to minimize diffs
-    for directory in module_paths:
-        rel_cmake_module_path = os.path.join(relative_path, directory)
-        # on windows cmake corrects this so we have to make it wrong again
-        rel_cmake_module_path = rel_cmake_module_path.replace('\\', '/')
-        s.append('list(APPEND CMAKE_MODULE_PATH ${{PROJECT_SOURCE_DIR}}/{0})'.format(rel_cmake_module_path))
-
     if len(modules) > 0:
         s.append('\n# included cmake modules')
     for module in modules:
-        s.append('include({0})'.format(os.path.splitext(module.name)[0]))
+        s.append('include({0})'.format(os.path.join('${PROJECT_SOURCE_DIR}',
+                                                    relative_path,
+                                                    module.path,
+                                                    module.name)))
 
     return s
 

cmake/autocmake/generate.py

@@ -1,21 +1,15 @@
-include(SetCompilerFlag)
-
 set(XCFun_C_FLAGS)
 set(XCFun_C_FLAGS_DEBUG)
 set(XCFun_C_FLAGS_RELEASE)
 set(XCFun_C_FLAGS_COVERAGE)
 
 # C99
-set_compiler_flag(
-  RESULT c99_flag
-  LANGUAGE C
-  REQUIRED
-  FLAGS "-std=c99;-c99;-c9x"
-  )
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED TRUE)
+set(CMAKE_C_EXTENSIONS FALSE)
 
 if(CMAKE_C_COMPILER_ID MATCHES GNU)
   list(APPEND XCFun_C_FLAGS
-    "${c99_flag}"
     "-ffloat-store"
     "-m64"
     )
@@ -44,7 +38,6 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
   list(APPEND XCFun_C_FLAGS
-    "${c99_flag}"
     "-m64"
     )
   list(APPEND XCFun_C_FLAGS_DEBUG
@@ -69,7 +62,6 @@ endif()
 
 if(CMAKE_C_COMPILER_ID MATCHES Intel)
   list(APPEND XCFun_C_FLAGS
-    "${c99_flag}"
     "-g"
     "-wd981"
     "-wd279"
@@ -94,7 +86,6 @@ endif ()
 
 if(CMAKE_C_COMPILER_ID MATCHES PGI)
   list(APPEND XCFun_C_FLAGS
-    "${c99_flag}"
     "-Mpreprocess"
     )
   list(APPEND XCFun_C_FLAGS_DEBUG

cmake/custom/compilers/CFlags.cmake

@@ -1,21 +1,15 @@
-include(SetCompilerFlag)
-
 set(XCFun_CXX_FLAGS)
 set(XCFun_CXX_FLAGS_DEBUG)
 set(XCFun_CXX_FLAGS_RELEASE)
 set(XCFun_CXX_FLAGS_COVERAGE)
 
 # C++11
-set_compiler_flag(
-  RESULT cxx11_flag
-  LANGUAGE CXX
-  REQUIRED
-  FLAGS "-std=c++11;-std=c++0x;--c++11;--c++0x"
-  )
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set(CMAKE_CXX_EXTENSIONS FALSE)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
   list(APPEND XCFun_CXX_FLAGS
-    "${cxx11_flag}"
     "-ffloat-store"
     "-fno-rtti"
     "-fno-exceptions"
@@ -48,7 +42,6 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
   list(APPEND XCFun_CXX_FLAGS
-    "${cxx11_flag}"
     "-fno-rtti"
     "-fno-exceptions"
     "-m64"
@@ -78,7 +71,6 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
   list(APPEND XCFun_CXX_FLAGS
-    "${cxx11_flag}"
     "-g"
     "-wd981"
     "-wd279"
@@ -101,7 +93,6 @@ endif ()
 if(CMAKE_CXX_COMPILER_ID MATCHES PGI)
   #236 suppress assert warnings and 175 suppress subscript out of range warning /SR
   list(APPEND XCFun_CXX_FLAGS
-    "${cxx11_flag}"
     "-Mpreprocess"
     "--diag_suppress 236"
     "--diag_suppress 175"

cmake/custom/compilers/CXXFlags.cmake

@@ -48,8 +48,8 @@ if(ENABLE_FC_SUPPORT)
   include(FortranCInterface)
   FortranCInterface_VERIFY(CXX)
   set(CMAKE_Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/modules)
-  include(FortranFlags)
-  include(int64)
+  include(${CMAKE_CURRENT_LIST_DIR}/compilers/FortranFlags.cmake)
+  include(${CMAKE_CURRENT_LIST_DIR}/int64.cmake)
 endif()
 
 if(ENABLE_PYTHON_INTERFACE)

cmake/custom/xcfun.cmake

@@ -1,6 +1,7 @@
 find_package(SWIG REQUIRED)
 include(UseSWIG)
 
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/custom)
 find_package(PythonLibsNew 2.7 REQUIRED)
 find_package(NumPy REQUIRED)
 
@@ -9,7 +10,7 @@ set_source_files_properties(xcfun_swig.i
     CPLUSPLUS
       ON
     SWIG_FLAGS
-      "-I${CMAKE_BINARY_DIR}/include;-I${PROJECT_SOURCE_DIR}/api"
+      "-I${PROJECT_BINARY_DIR}/include;-I${PROJECT_SOURCE_DIR}/api"
   )
 set(CMAKE_SWIG_OUTDIR ${PROJECT_BINARY_DIR}/${PYMOD_INSTALL_FULLDIR})
 

python/CMakeLists.txt

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # XCFun, an arbitrary order exchange-correlation library
-# Copyright (C) 2018 Ulf Ekström and contributors.
+# Copyright (C) 2019 Ulf Ekström and contributors.
 #
 # This file is part of XCFun.
 #