X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMakeLists.txt;h=e13c1fd420cff4a700cce21444500163d2117907;hb=60ae98b26965ead9238783c494c8b0d29f8e8d79;hp=2db4ab3a99f75bc6b90b33608b12fc6cd937b6c9;hpb=49aa94b8c4df6c3fd9d5c9688651c6f928f9aad1;p=m6w6%2Flibmemcached

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2db4ab3a..e13c1fd4 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})
@@ -18,13 +18,6 @@ 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)
 
@@ -49,6 +42,7 @@ if(NOT BUILD_DOCSONLY)
     add_subdirectory(support)
 
     if(BUILD_TESTING)
+        add_subdirectory(testing)
         add_subdirectory(tests)
     endif()
 
@@ -60,4 +54,6 @@ if(BUILD_DOCS OR BUILD_DOCSONLY)
     add_subdirectory(docs)
 endif()
 
-
+if(ENV{INVALID_CONFIGURATION})
+    message(FATAL_ERROR "invalid configuration -- giving up")
+endif()