projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cmake: fix manual library discovery
[awesomized/libmemcached]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index e13c1fd420cff4a700cce21444500163d2117907..ef29a4116b7d955f385ad9ac1ab24250430bbac2 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-11,16
+11,13
@@
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)
- set(AUTOHEADER_FILE mem_config.h)
-
set(CLIENTS
memcapable
memcat
set(CLIENTS
memcapable
memcat
@@
-37,17
+34,16
@@
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()
+ # tests need c++17 support
+ add_subdirectory(test)
# keep last
# 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)
endif()
if(BUILD_DOCS OR BUILD_DOCSONLY)