X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMakeLists.txt;h=19755ffd54cd299c884a5866920799eec036cd42;hb=fbb7de82d298d84c665ab465069fc6d925880e09;hp=09d1ad5023d57200962666fda56e8ea7ca604016;hpb=9bfc453e7add5cc54fdeaaf0c4ababa7ef4c02a1;p=awesomized%2Flibmemcached

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09d1ad50..19755ffd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,20 +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)
 
@@ -44,14 +36,10 @@ if(NOT BUILD_DOCSONLY)
             memtouch
             )
 
-    add_subdirectory(include)
     add_subdirectory(src)
+    add_subdirectory(include)
     add_subdirectory(support)
-
-    if(BUILD_TESTING)
-        add_subdirectory(testing)
-        add_subdirectory(tests)
-    endif()
+    add_subdirectory(test)
 
     # keep last
     configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY)