X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMakeLists.txt;h=ef29a4116b7d955f385ad9ac1ab24250430bbac2;hb=035a77665b2f811160371bda237fb6e91950c306;hp=2dc6982b3d1b07ccf702ff784d39b2cc92eba0bc;hpb=5e54d17fc535a901f384fcbf2cfd420f3a2e7a81;p=m6w6%2Flibmemcached

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dc6982b..ef29a411 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9..3.16)
+cmake_minimum_required(VERSION 3.9...3.18)
 
 if(${CMAKE_VERSION} VERSION_LESS 3.12)
     cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
@@ -11,22 +11,12 @@ project(libmemcached
         DESCRIPTION "libmemcached https://github.com/m6w6/libmemcached"
         )
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CXX_STANDARD 11)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 include(CMakeConfig.txt)
 
 if(NOT BUILD_DOCSONLY)
-    foreach(INCLUDE IN ITEMS ${CMAKE_BINARY_DIR} .)
-        include_directories(
-                ${INCLUDE}/
-                ${INCLUDE}/include
-                ${INCLUDE}/src
-                )
-    endforeach()
-
-    set(AUTOHEADER_FILE mem_config.h)
 
     set(CLIENTS
             memcapable
@@ -44,17 +34,16 @@ if(NOT BUILD_DOCSONLY)
             memtouch
             )
 
-    add_subdirectory(include)
     add_subdirectory(src)
+    add_subdirectory(contrib)
+    add_subdirectory(include)
     add_subdirectory(support)
 
-    if(BUILD_TESTING)
-        add_subdirectory(testing)
-        add_subdirectory(tests)
-    endif()
+    # tests need c++17 support
+    add_subdirectory(test)
 
     # keep last
-    configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY)
+    configure_file(${CONFIGURE_FILE_IN} ${CONFIGURE_FILE_OUT} @ONLY)
 endif()
 
 if(BUILD_DOCS OR BUILD_DOCSONLY)