From c5a6f03f5f9461ca0bcab1974b703b7daed1c7e6 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 12 May 2015 15:57:57 +0200 Subject: [SERVER] Fix dependency checks for dnbd3-server --- CMakeLists.txt | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bd9fa93..2125b31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,21 +31,31 @@ ADD_DEFINITIONS(-DWITH_IPV6) FIND_PACKAGE(Threads) FIND_PACKAGE(Fuse) -#FIND_PACKAGE(PkgConfig REQUIRED) -#FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(ZLIB) FIND_PACKAGE(Jansson) +SET(MAKE_SERVER True) + +message( " *************************************************" ) if(NOT FUSE_FOUND) message( " *** No fuse dev libs found, won't build dnbd3-fuse" ) SET(FUSE_INCLUDE_DIR "") endif() -if(NOT THREADS_FOUND OR NOT ZLIB_FOUND) - message( " *** No threads or no zlib found, won't build dnbd3-server" ) +if(MAKE_SERVER AND NOT THREADS_FOUND) + message( " *** No threads found, won't build dnbd3-server" ) + SET(MAKE_SERVER False) +endif() +if(MAKE_SERVER AND NOT ZLIB_FOUND) + message( " *** No zlib found, won't build dnbd3-server" ) SET(ZLIB_INCLUDE_DIR "") + SET(MAKE_SERVER False) endif() - -#PKG_CHECK_MODULES(GLIB glib-2.0 REQUIRED) +if(MAKE_SERVER AND NOT JANSSON_FOUND) + message( " *** No jansson lib found, won't build dnbd3-server" ) + SET(JANSSON_INCLUDE_DIR "") + SET(MAKE_SERVER False) +endif() +message( " *************************************************" ) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${ZLIB_INCLUDE_DIR} ${FUSE_INCLUDE_DIR} ${JANSSON_INCLUDE_DIR}) @@ -85,7 +95,7 @@ INSTALL(TARGETS dnbd3-client RUNTIME DESTINATION sbin) # SERVER # ################################################################################ -if(THREADS_FOUND AND ZLIB_FOUND) +if(MAKE_SERVER) FILE(GLOB_RECURSE SERVER_SRCS src/server/*.c) ADD_EXECUTABLE(dnbd3-server ${SERVER_SRCS}) TARGET_LINK_LIBRARIES(dnbd3-server ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${JANSSON_LIBRARIES}) -- cgit v1.2.3-55-g7522