Merge pull request #104 from njoy/c++17

C++17

Author: jlconlin

.gitmodules

@@ -19,9 +19,6 @@
 [submodule "dependencies/ENDFtk"]
 	path = dependencies/ENDFtk
 	url = https://github.com/njoy/ENDFtk.git
-[submodule "dependencies/variant-adapter"]
-	path = dependencies/variant-adapter
-	url = https://github.com/njoy/variant-adapter.git
 [submodule "dependencies/lipservice"]
 	path = dependencies/lipservice
 	url = https://github.com/njoy/lipservice.git

.travis.yml

@@ -15,7 +15,7 @@ if( NOT ROOT_DIRECTORY )
         if ( NOT PYTHON_EXECUTABLE )
             find_package( PythonInterp 3.4 )
             if ( NOT PYTHONINTERP_FOUND )
-                message( FATAL_ERROR "Python interpeter installation was not found." )
+                message( FATAL_ERROR "Python interpreter installation was not found." )
             endif()
         endif()
         execute_process( COMMAND ${PYTHON_EXECUTABLE} "./metaconfigure/fetch_subprojects.py"
@@ -71,7 +71,7 @@ option( profile_generate "Enable binary instrumentation to generation execution
 
 # additional optimizations
 option( link_time_optimization "Enable link time optimization in the RELEASE configuration" )
-option( profile_use "In the RELEASE configuration, leverage previously generated exeution profile to inform optimization decisions" )
+option( profile_use "In the RELEASE configuration, leverage previously generated execution profile to inform optimization decisions" )
 option( nonportable_optimization "Enable optimizations which compromise portability of resulting binary in the RELEASE configuration" )
 
 # libraries and linking
@@ -93,7 +93,7 @@ if ( profile_generate )
     file( MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/profiling" )
 endif()
 
-set( njoy21_AppleClang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( njoy21_AppleClang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_AppleClang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
 set( njoy21_AppleClang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_AppleClang_Darwin_strict_flags "-Werror" )
@@ -105,7 +105,7 @@ set( njoy21_AppleClang_Darwin_link_time_optimization_flags "-flto" )
 set( njoy21_AppleClang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( njoy21_AppleClang_Darwin_nonportable_optimization_flags "-march=native" )
 set( njoy21_AppleClang_Darwin_static_flags "-static" )
-set( njoy21_GNU_Darwin_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( njoy21_GNU_Darwin_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
 set( njoy21_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_GNU_Darwin_strict_flags "-Werror" )
@@ -117,7 +117,7 @@ set( njoy21_GNU_Darwin_link_time_optimization_flags "-flto" )
 set( njoy21_GNU_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( njoy21_GNU_Darwin_nonportable_optimization_flags "-march=native" )
 set( njoy21_GNU_Darwin_static_flags "-static" )
-set( njoy21_GNU_Linux_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-Wno-maybe-uninitialized" "-std=c++14" )
+set( njoy21_GNU_Linux_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_GNU_Linux_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
 set( njoy21_GNU_Linux_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_GNU_Linux_strict_flags "-Werror" )
@@ -129,7 +129,31 @@ set( njoy21_GNU_Linux_link_time_optimization_flags "-flto" )
 set( njoy21_GNU_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( njoy21_GNU_Linux_nonportable_optimization_flags "-march=native" )
 set( njoy21_GNU_Linux_static_flags "-static" )
-set( njoy21_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( njoy21_GNU_CYGWIN_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=gnu++17" )
+set( njoy21_GNU_CYGWIN_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( njoy21_GNU_CYGWIN_RELEASE_flags "-O3" "-DNDEBUG" )
+set( njoy21_GNU_CYGWIN_strict_flags "-Werror" )
+set( njoy21_GNU_CYGWIN_coverage_flags "--coverage" )
+set( njoy21_GNU_CYGWIN_subproject_flags  )
+set( njoy21_GNU_CYGWIN_base_project_flags  )
+set( njoy21_GNU_CYGWIN_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_GNU_CYGWIN_link_time_optimization_flags "-flto" )
+set( njoy21_GNU_CYGWIN_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_GNU_CYGWIN_nonportable_optimization_flags "-march=native" )
+set( njoy21_GNU_CYGWIN_static_flags "-static" )
+set( njoy21_GNU_MinGW_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
+set( njoy21_GNU_MinGW_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( njoy21_GNU_MinGW_RELEASE_flags "-O3" "-DNDEBUG" )
+set( njoy21_GNU_MinGW_strict_flags "-Werror" )
+set( njoy21_GNU_MinGW_coverage_flags "--coverage" )
+set( njoy21_GNU_MinGW_subproject_flags  )
+set( njoy21_GNU_MinGW_base_project_flags  )
+set( njoy21_GNU_MinGW_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_GNU_MinGW_link_time_optimization_flags "-flto" )
+set( njoy21_GNU_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_GNU_MinGW_nonportable_optimization_flags "-march=native" )
+set( njoy21_GNU_MinGW_static_flags "-static" )
+set( njoy21_GNU_Windows_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
 set( njoy21_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_GNU_Windows_strict_flags "-Werror" )
@@ -141,7 +165,7 @@ set( njoy21_GNU_Windows_link_time_optimization_flags "-flto" )
 set( njoy21_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( njoy21_GNU_Windows_nonportable_optimization_flags "-march=native" )
 set( njoy21_GNU_Windows_static_flags "-static" )
-set( njoy21_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( njoy21_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
 set( njoy21_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_Clang_Darwin_strict_flags "-Werror" )
@@ -153,7 +177,7 @@ set( njoy21_Clang_Darwin_link_time_optimization_flags "-flto" )
 set( njoy21_Clang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( njoy21_Clang_Darwin_nonportable_optimization_flags "-march=native" )
 set( njoy21_Clang_Darwin_static_flags "-static" )
-set( njoy21_Clang_Linux_common_flags "-stdlib=libstdc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( njoy21_Clang_Linux_common_flags "-stdlib=libstdc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_Clang_Linux_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
 set( njoy21_Clang_Linux_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_Clang_Linux_strict_flags "-Werror" )
@@ -165,7 +189,31 @@ set( njoy21_Clang_Linux_link_time_optimization_flags "-flto" )
 set( njoy21_Clang_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( njoy21_Clang_Linux_nonportable_optimization_flags "-march=native" )
 set( njoy21_Clang_Linux_static_flags "-static" )
-set( njoy21_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( njoy21_Clang_CYGWIN_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=gnu++17" )
+set( njoy21_Clang_CYGWIN_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( njoy21_Clang_CYGWIN_RELEASE_flags "-O3" "-DNDEBUG" )
+set( njoy21_Clang_CYGWIN_strict_flags "-Werror" )
+set( njoy21_Clang_CYGWIN_coverage_flags "--coverage" )
+set( njoy21_Clang_CYGWIN_subproject_flags  )
+set( njoy21_Clang_CYGWIN_base_project_flags  )
+set( njoy21_Clang_CYGWIN_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_Clang_CYGWIN_link_time_optimization_flags "-flto" )
+set( njoy21_Clang_CYGWIN_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_Clang_CYGWIN_nonportable_optimization_flags "-march=native" )
+set( njoy21_Clang_CYGWIN_static_flags "-static" )
+set( njoy21_Clang_MinGW_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
+set( njoy21_Clang_MinGW_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( njoy21_Clang_MinGW_RELEASE_flags "-O3" "-DNDEBUG" )
+set( njoy21_Clang_MinGW_strict_flags "-Werror" )
+set( njoy21_Clang_MinGW_coverage_flags "--coverage" )
+set( njoy21_Clang_MinGW_subproject_flags  )
+set( njoy21_Clang_MinGW_base_project_flags  )
+set( njoy21_Clang_MinGW_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_Clang_MinGW_link_time_optimization_flags "-flto" )
+set( njoy21_Clang_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( njoy21_Clang_MinGW_nonportable_optimization_flags "-march=native" )
+set( njoy21_Clang_MinGW_static_flags "-static" )
+set( njoy21_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
 set( njoy21_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
 set( njoy21_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
 set( njoy21_Clang_Windows_strict_flags "-Werror" )
@@ -227,10 +275,6 @@ if( NOT TARGET header-utilities )
     add_subdirectory( ${ROOT_DIRECTORY}/subprojects/header-utilities )
 endif()
 
-if( NOT TARGET variant-adapter )
-    add_subdirectory( ${ROOT_DIRECTORY}/subprojects/variant-adapter )
-endif()
-
 if( NOT TARGET ENDFtk )
     add_subdirectory( ${ROOT_DIRECTORY}/subprojects/ENDFtk )
 endif()
@@ -323,7 +367,7 @@ add_library( njoy21 ${njoy21_library_linkage}
              "${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp"
              "${CMAKE_CURRENT_BINARY_DIR}/src/njoy21/Signature.hpp" )
 
-target_include_directories( njoy21 PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src src )
+target_include_directories( njoy21 PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src src/ )
 
 set( PREFIX njoy21_${CMAKE_CXX_COMPILER_ID}_${CMAKE_SYSTEM_NAME} )
 
@@ -346,7 +390,7 @@ ${CXX_appended_flags} ${njoy21_appended_flags} )
 
 target_link_libraries( njoy21 PUBLIC "$<$<AND:$<CONFIG:RELEASE>,$<BOOL:${link_time_optimization}>>:${${PREFIX}_RELEASE_flags};${${PREFIX}_link_time_optimization_flags}$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags};>$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags};>$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags};>>$<$<CONFIG:DEBUG>:$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags};>>$<$<BOOL:CXX_appended_flags>:${CXX_appended_flags};>$<$<BOOL:njoy21_appended_flags>:${njoy21_appended_flags};>" )
 
-target_link_libraries( njoy21 PUBLIC ENDFtk PUBLIC tclap-adapter PUBLIC njoy_c_bindings PUBLIC variant-adapter PUBLIC lipservice PUBLIC dimwits PUBLIC utility )
+target_link_libraries( njoy21 PUBLIC ENDFtk PUBLIC tclap-adapter PUBLIC njoy_c_bindings PUBLIC lipservice PUBLIC dimwits PUBLIC utility )
 
 if ( NOT is_subproject )
     add_executable( njoy21_executable src/main.cpp )
@@ -400,7 +444,7 @@ install( FILES "${CMAKE_BINARY_DIR}/signature.json"
                      GROUP_READ
                      WORLD_READ
 )
-install( DIRECTORY src/ DESTINATION include
+install( DIRECTORY src// DESTINATION include
          FILE_PERMISSIONS OWNER_READ OWNER_WRITE
                           GROUP_READ
                           WORLD_READ

.travis/signature.sh

@@ -7,4 +7,4 @@ Additionally, redistribution and use in source and binary forms, with or without
 2.      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 3.      Neither the name of Los Alamos National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

CMakeLists.txt

@@ -32,7 +32,7 @@ def fetch_subprojects(state):
                 if ( NOT PYTHON_EXECUTABLE )
                     find_package( PythonInterp 3.4 )
                     if ( NOT PYTHONINTERP_FOUND )
-                        message( FATAL_ERROR "Python interpeter installation was not found." )
+                        message( FATAL_ERROR "Python interpreter installation was not found." )
                     endif()
                 endif()
                 execute_process( COMMAND ${PYTHON_EXECUTABLE} "./metaconfigure/fetch_subprojects.py"
@@ -172,7 +172,7 @@ def define_options(state):
 
     # additional optimizations
     option( link_time_optimization "Enable link time optimization in the RELEASE configuration" )
-    option( profile_use "In the RELEASE configuration, leverage previously generated exeution profile to inform optimization decisions" )
+    option( profile_use "In the RELEASE configuration, leverage previously generated execution profile to inform optimization decisions" )
     option( nonportable_optimization "Enable optimizations which compromise portability of resulting binary in the RELEASE configuration" )
 
     # libraries and linking

buildspec.yml

@@ -25,7 +25,7 @@ def traverse_dependencies( destination, traversed ):
     """
     if not os.path.isdir( dependency_directory() ):
         return
-    
+
     os.chdir( dependency_directory() )
 
     for dependency in os.listdir( os.getcwd() ) :
@@ -48,14 +48,14 @@ def traverse_dependencies( destination, traversed ):
 
             traverse_dependencies( destination, traversed )
             os.chdir( ".." )
-            
+
     os.chdir( os.path.join( ".." ) )
 
 def collect_subprojects():
     destination = os.path.join( os.getcwd(), "subprojects" )
     if not os.path.isdir( destination ):
         os.makedirs( destination )
-        
+
     traverse_dependencies( destination, set() )
 
 collect_subprojects()