projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
testing: honor MEMCACHED_BINARY; use Catch.cmake
[m6w6/libmemcached]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 2db4ab3a99f75bc6b90b33608b12fc6cd937b6c9..7b76f6888dd86035ef7acdc149eec7de68c9175b 100644
(file)
--- 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})
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)
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)
@@
-47,10
+40,7
@@
if(NOT BUILD_DOCSONLY)
add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(support)
add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(support)
-
- if(BUILD_TESTING)
- add_subdirectory(tests)
- endif()
+ add_subdirectory(testing)
# keep last
configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY)
# keep last
configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY)
@@
-60,4
+50,6
@@
if(BUILD_DOCS OR BUILD_DOCSONLY)
add_subdirectory(docs)
endif()
add_subdirectory(docs)
endif()
-
+if(ENV{INVALID_CONFIGURATION})
+ message(FATAL_ERROR "invalid configuration -- giving up")
+endif()