projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
memaslap: mv src/bin/contrib => contrib/bin
[awesomized/libmemcached]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 09d1ad5023d57200962666fda56e8ea7ca604016..cab79f2c7ba53270c05161a6be5107c681bfdf32 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-11,20
+11,12
@@
project(libmemcached
DESCRIPTION "libmemcached https://github.com/m6w6/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)
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(AUTOHEADER_FILE mem_config.h)
@@
-44,14
+36,11
@@
if(NOT BUILD_DOCSONLY)
memtouch
)
memtouch
)
- add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(src)
+ add_subdirectory(contrib)
+ add_subdirectory(include)
add_subdirectory(support)
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)
# keep last
configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY)