From 1c27276ea08e6a6ab17c8f264d29e69e25f4c5de Mon Sep 17 00:00:00 2001 From: Janosch Dobler Date: Tue, 1 Mar 2016 10:45:02 +0100 Subject: cmake: Don't fail setup if more than one server lib is missing "If Zlib AND Jansson are not found, JANSSON_INCLUDE_DIR is not set to an empty string and cmake configuring fails." --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fff106..759fbcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,16 +48,16 @@ if(NOT FUSE_FOUND) message( " *** No fuse dev libs found, won't build dnbd3-fuse" ) SET(FUSE_INCLUDE_DIR "") endif() -if(MAKE_SERVER AND NOT THREADS_FOUND) +if(NOT THREADS_FOUND) message( " *** No threads found, won't build dnbd3-server" ) SET(MAKE_SERVER False) endif() -if(MAKE_SERVER AND NOT ZLIB_FOUND) +if(NOT ZLIB_FOUND) message( " *** No zlib found, won't build dnbd3-server" ) SET(ZLIB_INCLUDE_DIR "") SET(MAKE_SERVER False) endif() -if(MAKE_SERVER AND NOT JANSSON_FOUND) +if(NOT JANSSON_FOUND) message( " *** No jansson lib found, won't build dnbd3-server" ) SET(JANSSON_INCLUDE_DIR "") SET(MAKE_SERVER False) -- cgit v1.2.3-55-g7522