Impose GNU standard installation directories and maintenance for Travis CI

1. Recovers work done by @loriab to impose GNU standard
installation directories as described
[here](http://www.gnu.org/prep/standards/html_node/Directory-Variables.html)
2. The GNU C++ extended diagnostic flags are always enabled in
debug mode for GCC >= 4.9.0
3. Maintenance of Travis CI builds. In particular, use a Python
virtualenv to install the Python dependencies of the build.

Author: robertodr

.travis.yml

@@ -13,7 +13,6 @@ env:
   - CCACHE_COMPRESS=1
   - CCACHE_MAXSIZE=200M
   - CCACHE_CPP2=1
-  - PYTHON_PACKAGES="pip pep8 cpp-coveralls"
 matrix:
   include:
   - os: linux
@@ -31,13 +30,9 @@ matrix:
         - clang-3.5
         - libboost1.55-all-dev
         - gfortran
+        - python-virtualenv
     env: CXX_COMPILER='clang++-3.5' C_COMPILER='clang-3.5' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: clang
-    addons: *1
-    env: CXX_COMPILER='clang++-3.5' C_COMPILER='clang-3.5' Fortran_COMPILER='gfortran'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: clang
     addons: &2
@@ -53,13 +48,9 @@ matrix:
         - clang-3.6
         - libboost1.55-all-dev
         - gfortran
+        - python-virtualenv
     env: CXX_COMPILER='clang++-3.6' C_COMPILER='clang-3.6' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: clang
-    addons: *2
-    env: CXX_COMPILER='clang++-3.6' C_COMPILER='clang-3.6' Fortran_COMPILER='gfortran'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: clang
     addons: &3
@@ -75,13 +66,9 @@ matrix:
         - clang-3.7
         - libboost1.55-all-dev
         - gfortran
+        - python-virtualenv
     env: CXX_COMPILER='clang++-3.7' C_COMPILER='clang-3.7' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: clang
-    addons: *3
-    env: CXX_COMPILER='clang++-3.7' C_COMPILER='clang-3.7' Fortran_COMPILER='gfortran'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: clang
     addons: &4
@@ -97,13 +84,9 @@ matrix:
         - clang-3.8
         - libboost1.55-all-dev
         - gfortran
+        - python-virtualenv
     env: CXX_COMPILER='clang++-3.8' C_COMPILER='clang-3.8' Fortran_COMPILER='gfortran'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: clang
-    addons: *4
-    env: CXX_COMPILER='clang++-3.8' C_COMPILER='clang-3.8' Fortran_COMPILER='gfortran'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: gcc
     addons: &5
@@ -119,13 +102,9 @@ matrix:
         - gcc-4.6
         - libboost1.55-all-dev
         - gfortran-4.6
+        - python-virtualenv
     env: CXX_COMPILER='g++-4.6' C_COMPILER='gcc-4.6' Fortran_COMPILER='gfortran-4.6'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: gcc
-    addons: *5
-    env: CXX_COMPILER='g++-4.6' C_COMPILER='gcc-4.6' Fortran_COMPILER='gfortran-4.6'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: gcc
     addons: &6
@@ -141,13 +120,9 @@ matrix:
         - gcc-4.7
         - libboost1.55-all-dev
         - gfortran-4.7
+        - python-virtualenv
     env: CXX_COMPILER='g++-4.7' C_COMPILER='gcc-4.7' Fortran_COMPILER='gfortran-4.7'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: gcc
-    addons: *6
-    env: CXX_COMPILER='g++-4.7' C_COMPILER='gcc-4.7' Fortran_COMPILER='gfortran-4.7'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: gcc
     addons: &7
@@ -163,13 +138,9 @@ matrix:
         - gcc-4.8
         - libboost1.55-all-dev
         - gfortran-4.8
+        - python-virtualenv
     env: CXX_COMPILER='g++-4.8' C_COMPILER='gcc-4.8' Fortran_COMPILER='gfortran-4.8'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: gcc
-    addons: *7
-    env: CXX_COMPILER='g++-4.8' C_COMPILER='gcc-4.8' Fortran_COMPILER='gfortran-4.8'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: gcc
     addons: &8
@@ -185,13 +156,9 @@ matrix:
         - gcc-4.9
         - libboost1.55-all-dev
         - gfortran-4.9
+        - python-virtualenv
     env: CXX_COMPILER='g++-4.9' C_COMPILER='gcc-4.9' Fortran_COMPILER='gfortran-4.9'
       BUILD_TYPE='release'
-  - os: linux
-    compiler: gcc
-    addons: *8
-    env: CXX_COMPILER='g++-4.9' C_COMPILER='gcc-4.9' Fortran_COMPILER='gfortran-4.9'
-      BUILD_TYPE='debug'
   - os: linux
     compiler: gcc
     addons: &9
@@ -207,42 +174,29 @@ matrix:
         - gcc-5
         - libboost1.55-all-dev
         - gfortran-5
+        - python-virtualenv
     env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
-  - os: linux
-    compiler: gcc
-    addons: *9
-    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='debug'
-  - os: osx
-    osx_image: xcode7
-    compiler: clang
-    env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran' BUILD_TYPE='debug'
   - os: osx
     osx_image: xcode7
     compiler: clang
     env: CXX_COMPILER='clang++' C_COMPILER='clang' Fortran_COMPILER='gfortran' BUILD_TYPE='release'
-  - os: osx
-    osx_image: xcode7
-    compiler: gcc
-    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran' BUILD_TYPE='debug'
   - os: osx
     osx_image: xcode7
     compiler: gcc
     env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran' BUILD_TYPE='release'
   - os: linux
     compiler: gcc
     addons: *9
-    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='debug'
+    env: CXX_COMPILER='g++-5' C_COMPILER='gcc-5' Fortran_COMPILER='gfortran-5' BUILD_TYPE='release'
       COVERAGE=true
 install:
-- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
-- mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
 - |
-  if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-    pip install --upgrade ${PYTHON_PACKAGES} --user `whoami`
-  elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-    brew install cmake boost python gcc
-    pip install --upgrade ${PYTHON_PACKAGES}
+  if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
+    brew install cmake boost python gcc pyenv-virtualenv
   fi
+  virtualenv venv
+  source venv/bin/activate
+  pip install --upgrade -r .travis_requirements.txt
 before_script:
 - cd ${TRAVIS_BUILD_DIR}
 - export CXX=${CXX_COMPILER}

.travis_requirements.txt

@@ -0,0 +1,3 @@
+pep8
+cpp-coveralls
+pyyaml

CMakeLists.txt

@@ -28,6 +28,7 @@ include(Fortran_C)
 include(CXXFlags)
 include(CFlags)
 include(FortranFlags)
+include(GNUdirs)
 include(autocmake_ccache)
 include(rpath)
 include(windows)
@@ -48,6 +49,7 @@ include(libtaylor)
 include(zlib)
 include(autogenerated)
 include(documentation)
+include(export)
 include(api)
 include(autocmake_src)
 include(test)

cmake/autocmake.yml

@@ -17,6 +17,7 @@ modules:
       - 'custom/compilers/FortranFlags.cmake'
   - plugins:
     - source:
+      - 'custom/GNUdirs.cmake'
       - '%(url_root)modules/ccache.cmake'
       - 'custom/rpath.cmake'
       - 'custom/windows.cmake'
@@ -43,6 +44,7 @@ modules:
       - 'custom/zlib.cmake'
       - 'custom/autogenerated.cmake'
       - 'custom/documentation.cmake'
+      - 'custom/export.cmake'
       - 'custom/api.cmake'
   - src:
     - source: '%(url_root)modules/src.cmake'

cmake/custom/GNUdirs.cmake

@@ -0,0 +1,20 @@
+#.rst:
+#
+# Enables manipulation of install directories.
+#
+# Variables modified::
+#
+#   CMAKE_INSTALL_BINDIR
+#   CMAKE_INSTALL_LIBDIR
+#   CMAKE_INSTALL_INCLUDEDIR
+#   CMAKE_INSTALL_DATADIR
+#
+# autocmake.yml configuration::
+#
+# ?
+
+if("${${CMAKE_INSTALL_LIBDIR}}" STREQUAL "" OR NOT DEFINED ${CMAKE_INSTALL_LIBDIR})
+  set(${CMAKE_INSTALL_LIBDIR} lib CACHE STRING "Directory to which libraries are installed" FORCE)
+endif()
+
+include(GNUInstallDirs)

cmake/custom/api.cmake

@@ -1,7 +1,7 @@
 include_directories(${PROJECT_SOURCE_DIR}/api)
 
-install(FILES ${PROJECT_SOURCE_DIR}/api/pcmsolver.h DESTINATION include)
-install(FILES ${PROJECT_SOURCE_DIR}/api/PCMInput.h DESTINATION include)
+install(FILES ${PROJECT_SOURCE_DIR}/api/pcmsolver.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+install(FILES ${PROJECT_SOURCE_DIR}/api/PCMInput.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
 if(ENABLE_FORTRAN_API)
     add_definitions(-DENABLE_FORTRAN_API)

cmake/custom/autogenerated.cmake

@@ -14,34 +14,37 @@ add_custom_target(generate-config-hpp ALL DEPENDS ${PROJECT_BINARY_DIR}/include/
 if(BUILD_CUSTOM_BOOST)
   add_dependencies(generate-config-hpp custom_boost)
 endif()
-install(FILES ${PROJECT_BINARY_DIR}/include/Config.hpp DESTINATION include)
+install(FILES ${PROJECT_BINARY_DIR}/include/Config.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
 generate_git_info_header(${PROJECT_BINARY_DIR}/include GitInfo.hpp)
+install(FILES ${PROJECT_BINARY_DIR}/include/GitInfo.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
 # Configure the input parsing script
 configure_file(${PROJECT_SOURCE_DIR}/tools/pcmsolver.py.in ${PROJECT_BINARY_DIR}/bin/tmp-pcmsolver-py @ONLY)
 add_custom_command(
   DEPENDS ${PROJECT_SOURCE_DIR}/tools/pcmsolver.py.in
   OUTPUT
-    ${PROJECT_BINARY_DIR}/bin/pcmsolver.py
+    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/pcmsolver.py
   COMMAND
-    cmake -E copy ${PROJECT_BINARY_DIR}/bin/tmp-pcmsolver-py ${PROJECT_BINARY_DIR}/bin/pcmsolver.py
+    cmake -E copy ${PROJECT_BINARY_DIR}/bin/tmp-pcmsolver-py ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/pcmsolver.py
   VERBATIM
   )
-add_custom_target(generate-pcmsolver-py ALL DEPENDS ${PROJECT_BINARY_DIR}/bin/pcmsolver.py)
-install(FILES ${PROJECT_BINARY_DIR}/bin/pcmsolver.py DESTINATION bin)
+add_custom_target(generate-pcmsolver-py ALL DEPENDS ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/pcmsolver.py)
+install(FILES ${PROJECT_BINARY_DIR}/bin/pcmsolver.py DESTINATION ${CMAKE_INSTALL_BINDIR})
 # Configure the codata Python module
-configure_file(${PROJECT_SOURCE_DIR}/tools/codata.py.in ${PROJECT_BINARY_DIR}/bin/codata.py @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/bin/codata.py DESTINATION bin)
+configure_file(${PROJECT_SOURCE_DIR}/tools/codata.py.in ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/codata.py @ONLY)
+install(FILES ${PROJECT_BINARY_DIR}/bin/codata.py DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # Install GetKw Python bindings
 file(COPY ${PROJECT_SOURCE_DIR}/tools/getkw.py
           ${PROJECT_SOURCE_DIR}/tools/pyparsing.py
-     DESTINATION bin)
+     DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${PROJECT_SOURCE_DIR}/tools/getkw.py
               ${PROJECT_SOURCE_DIR}/tools/pyparsing.py
-        DESTINATION bin)
+        DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # Install docopt.py in the bin subdirectory
-file(COPY ${PROJECT_SOURCE_DIR}/cmake/lib/docopt/docopt.py DESTINATION ${PROJECT_BINARY_DIR}/bin)
-install(FILES ${PROJECT_SOURCE_DIR}/cmake/lib/docopt/docopt.py DESTINATION bin)
+file(COPY ${PROJECT_SOURCE_DIR}/cmake/lib/docopt/docopt.py
+     DESTINATION ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+install(FILES ${PROJECT_SOURCE_DIR}/cmake/lib/docopt/docopt.py
+        DESTINATION ${CMAKE_INSTALL_BINDIR})

cmake/custom/catch.cmake

@@ -1,2 +1 @@
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/external/Catch DESTINATION ${PROJECT_BINARY_DIR}/external/include)
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/Catch)

cmake/custom/compilers/Fortran_C.cmake

@@ -23,11 +23,9 @@ FortranCInterface_VERIFY(CXX)
 # Generates with name-mangling helper macros and post-process it to add the copyright notice
 FortranCInterface_HEADER(${PROJECT_BINARY_DIR}/include/FCMangle.hpp)
 file(STRINGS ${PROJECT_BINARY_DIR}/include/FCMangle.hpp contents NEWLINE_CONSUME)
-file(WRITE ${PROJECT_BINARY_DIR}/include/FCMangle.hpp
-    "/* pcmsolver_copyright_start */\n/* pcmsolver_copyright_end */\n\n")
 file(APPEND ${PROJECT_BINARY_DIR}/include/FCMangle.hpp "// Header file automagically generated by CMake. DO NOT TOUCH!\n")
 file(APPEND ${PROJECT_BINARY_DIR}/include/FCMangle.hpp ${contents})
-install(FILES ${PROJECT_BINARY_DIR}/include/FCMangle.hpp DESTINATION include)
+install(FILES ${PROJECT_BINARY_DIR}/include/FCMangle.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
 if(BROKEN_MACOSX)
     set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS_HOLD})

cmake/custom/compilers/GNU.CXX.cmake

@@ -15,6 +15,10 @@ if(NOT DEFINED ENV{CXXFLAGS})
 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD_FLAG}")
     set(EXDIAG_CXX_FLAGS -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Wuseless-cast -Wunsafe-loop-optimizations)
+    if(CXX_COMPILER_VERSION VERSION_LESS 4.9.0)
+      message(STATUS "Old GNU C++ compiler. Turning off extended diagnostic flags.")
+      set(EXDIAG_CXX_FLAGS)
+    endif()
     set(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g3 -DDEBUG -Wall -Wextra -Winit-self -Woverloaded-virtual -Wuninitialized -Wmissing-declarations -Wwrite-strings -Wno-sign-compare")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -Wno-unused")
   endif()