diff options
| author | Simon Rettberg | 2017-10-24 14:19:53 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-10-24 14:19:53 +0200 |
| commit | 3bf0f5cfbe96b8aa8681f8fb26868188b52ec8e8 (patch) | |
| tree | 73ff80a5925105f85e7f28353ba1421ed22848f0 /CMakeLists.txt | |
| parent | [SERVER] Fix types or add explicit casts everywhere we might have type conver... (diff) | |
| download | dnbd3-3bf0f5cfbe96b8aa8681f8fb26868188b52ec8e8.tar.gz dnbd3-3bf0f5cfbe96b8aa8681f8fb26868188b52ec8e8.tar.xz dnbd3-3bf0f5cfbe96b8aa8681f8fb26868188b52ec8e8.zip | |
[SERVER] Get rid of zlib dependency
We only used it for CRC-32, so now the source
tree includes a stripped down version of the crc32
code from the zlib project.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44d5e10..6f35c0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ if(CMAKE_C_COMPILER MATCHES "clang") SET(CMAKE_C_FLAGS_RELEASE "-std=c11 -O2 -Wno-unused-result -D_GNU_SOURCE -DNDEBUG -Wno-multichar -fno-strict-aliasing") elseif (CMAKE_C_COMPILER MATCHES "(cc-)|(cc$)") message( "Using (g)cc flags." ) - SET(CMAKE_C_FLAGS_DEBUG "-std=c11 -O0 -g -Wall -Wextra -Wpedantic -D_GNU_SOURCE -D_DEBUG -Wno-multichar -fno-strict-aliasing") + SET(CMAKE_C_FLAGS_DEBUG "-std=c11 -O0 -g -Wall -Wextra -Wpedantic -Wconversion -Wno-sign-conversion -D_GNU_SOURCE -D_DEBUG -Wno-multichar -fno-strict-aliasing") SET(CMAKE_C_FLAGS_RELEASE "-std=c11 -O2 -Wno-unused-result -D_GNU_SOURCE -DNDEBUG -Wno-multichar -fno-strict-aliasing") else() message( FATAL_ERROR "Could not determine compiler type." ) @@ -68,16 +68,11 @@ if(BUILD_FUSE_CLIENT) endif() endif() if(BUILD_SERVER) - FIND_PACKAGE(ZLIB) FIND_PACKAGE(Jansson) if(NOT THREADS_FOUND) message( " *** No threads found, can't build dnbd3-server" ) SET(DO_ABORT True) endif() - if(NOT ZLIB_FOUND) - message( " *** No zlib found, can't build dnbd3-server" ) - SET(DO_ABORT True) - endif() if(NOT JANSSON_FOUND) message( " *** No jansson lib found, can't build dnbd3-server" ) SET(DO_ABORT True) @@ -95,7 +90,6 @@ if(DO_ABORT) endif() #SET(FUSE_INCLUDE_DIR "") -#SET(ZLIB_INCLUDE_DIR "") #SET(JANSSON_INCLUDE_DIR "") ################################################################################ @@ -146,10 +140,10 @@ ENDIF() ################################################################################ if(BUILD_SERVER) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${ZLIB_INCLUDE_DIR} ${JANSSON_INCLUDE_DIR}) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${JANSSON_INCLUDE_DIR}) FILE(GLOB SERVER_SRCS src/server/*.c src/shared/*.c) ADD_EXECUTABLE(dnbd3-server ${SERVER_SRCS}) - TARGET_LINK_LIBRARIES(dnbd3-server ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${JANSSON_LIBRARIES}) + TARGET_LINK_LIBRARIES(dnbd3-server ${CMAKE_THREAD_LIBS_INIT} ${JANSSON_LIBRARIES}) if(UNIX AND NOT APPLE) target_link_libraries(dnbd3-server rt) endif() |