X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=CMakeLists.txt;h=36ca49888eee470476afaa34c9419cfd0b09aa2b;hb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;hp=1f12aaca80600960f630c5929b3f7ba070b2c9a1;hpb=c97065e8f496be4d36ffe020fba19c6be4c2a04e;p=m6w6%2Flibmemcached

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f12aaca..36ca4988 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,13 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 include(CMakeConfig.txt)
 
-include_directories(${CMAKE_BINARY_DIR})
+foreach(INCLUDE IN ITEMS ${CMAKE_BINARY_DIR} .)
+    include_directories(
+            ${INCLUDE}/
+            ${INCLUDE}/include
+            ${INCLUDE}/src
+            )
+endforeach()
 set(AUTOHEADER_FILE mem_config.h)
 
 set(CLIENTS
@@ -36,21 +42,14 @@ set(CLIENTS
         memtouch
         )
 
-add_subdirectory(clients)
-add_subdirectory(libhashkit)
-add_subdirectory(libhashkit-1.0)
-add_subdirectory(libmemcached)
-add_subdirectory(libmemcached-1.0)
-add_subdirectory(libmemcachedutil)
-add_subdirectory(libmemcachedutil-1.0)
+add_subdirectory(include)
+add_subdirectory(src)
+add_subdirectory(docs)
+add_subdirectory(support)
 
 if(BUILD_TESTING)
-    add_subdirectory(libtest)
     add_subdirectory(tests)
 endif()
 
-add_subdirectory(docs)
-add_subdirectory(support)
-
 # keep last
-configure_file(mem_config.h.in ${CMAKE_BINARY_DIR}/${AUTOHEADER_FILE} @ONLY)
+configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY)