Increment minimum required CMake version to 3.15 (nonstd-lite issue 73)

nonstd-lite/nonstd-lite#73

Author: martinmoene

CMakeLists.txt

@@ -5,7 +5,7 @@
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-cmake_minimum_required( VERSION 3.5 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.15 FATAL_ERROR )
 
 # value_ptr-lite project and version, updated by script/update-version.py:
 

example/CMakeLists.txt

@@ -6,7 +6,7 @@
 # (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 if( NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION )
-    cmake_minimum_required( VERSION 3.8 FATAL_ERROR )
+    cmake_minimum_required( VERSION 3.15 FATAL_ERROR )
 endif()
 
 project( example LANGUAGES CXX )

test/CMakeLists.txt

@@ -7,17 +7,18 @@
 
 
 if( NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION )
-    cmake_minimum_required( VERSION 3.5 FATAL_ERROR )
+    cmake_minimum_required( VERSION 3.15 FATAL_ERROR )
 endif()
 
 project( test LANGUAGES CXX )
 
 option( VALUE_PTR_LITE_COLOURISE_TEST "Colourise test output" OFF )
 
-set( unit_name "value-ptr" )
+# unit_name provided by toplevel CMakeLists.txt [set( unit_name "xxx" )]
 set( PACKAGE   ${unit_name}-lite )
 set( PROGRAM   ${unit_name}-lite )
 set( SOURCES   ${unit_name}-main.t.cpp ${unit_name}.t.cpp )
+set( TWEAKD    "." )
 
 message( STATUS "Subproject '${PROJECT_NAME}', programs '${PROGRAM}-*'")
 
@@ -76,6 +77,9 @@ elseif( CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang" )
         if( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1.0 )
             set( HAS_CPP17_FLAG TRUE )
         endif()
+        if( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0.0 )
+            set( HAS_CPP20_FLAG TRUE )
+        endif()
 
     # AppleClang: available -std flags depends on version
     elseif( CMAKE_CXX_COMPILER_ID MATCHES "AppleClang" )
@@ -90,6 +94,9 @@ elseif( CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang" )
         if( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.2.0 )
             set( HAS_CPP17_FLAG TRUE )
         endif()
+        # if( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS x.x.x )
+        #     set( HAS_CPP20_FLAG TRUE )
+        # endif()
 
     # Clang: available -std flags depends on version
     elseif( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
@@ -104,6 +111,9 @@ elseif( CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang" )
         if( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0.0 )
             set( HAS_CPP17_FLAG TRUE )
         endif()
+        if( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0.0 )
+            set( HAS_CPP20_FLAG TRUE )
+        endif()
     endif()
 
 elseif( CMAKE_CXX_COMPILER_ID MATCHES "Intel" )
@@ -132,6 +142,7 @@ function( make_target target std )
 
     add_executable            ( ${target} ${SOURCES} )
     target_include_directories( ${target} SYSTEM  PRIVATE lest )
+    target_include_directories( ${target} PRIVATE ${TWEAKD} )
     target_link_libraries     ( ${target} PRIVATE ${PACKAGE} )
     target_compile_options    ( ${target} PRIVATE ${OPTIONS} )
     target_compile_definitions( ${target} PRIVATE ${DEFINITIONS} )
@@ -179,17 +190,19 @@ else()
         enable_msvs_guideline_checker( ${PROGRAM}-cpp17.t )
     endif()
 
+    if( HAS_CPP20_FLAG )
+        make_target( ${PROGRAM}-cpp20.t 20 )
+    endif()
+
     if( HAS_CPPLATEST_FLAG )
         make_target( ${PROGRAM}-cpplatest.t latest )
     endif()
 endif()
 
 # configure unit tests via CTest:
 
-enable_testing()
-
 if( HAS_STD_FLAGS )
-    # unconditionally add C++98 variant for MSVC:
+# unconditionally add C++98 variant for MSVC:
     add_test(     NAME test-cpp98     COMMAND ${PROGRAM}-cpp98.t )
 
     if( HAS_CPP11_FLAG )
@@ -201,6 +214,9 @@ if( HAS_STD_FLAGS )
     if( HAS_CPP17_FLAG )
         add_test( NAME test-cpp17     COMMAND ${PROGRAM}-cpp17.t )
     endif()
+    if( HAS_CPP20_FLAG )
+        add_test( NAME test-cpp20     COMMAND ${PROGRAM}-cpp20.t )
+    endif()
     if( HAS_CPPLATEST_FLAG )
         add_test( NAME test-cpplatest COMMAND ${PROGRAM}-cpplatest.t )
     endif()