More fixes for slave build.

CMakeLists.txt

@@ -4,32 +4,17 @@ SET(RDNS_VERSION_MAJOR 0)
 SET(RDNS_VERSION_MINOR 1)
 SET(RDNS_VERSION_PATCH 0)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+IF(NOT SLAVE_BUILD)
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
+ELSE(NOT SLAVE_BUILD)
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+ENDIF(NOT SLAVE_BUILD)
 
 OPTION(ENABLE_CURVE "Enable DNSCurve plugin" ON)
 
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckSymbolExists)
 
-IF(NOT SLAVE_BUILD)
- CHECK_SYMBOL_EXISTS(IPV6_V6ONLY "sys/socket.h;netinet/in.h" HAVE_IPV6_V6ONLY)
-
- CHECK_SYMBOL_EXISTS(getaddrinfo "sys/types.h;sys/socket.h;netdb.h" HAVE_GETADDRINFO)
- IF(NOT HAVE_GETADDRINFO)
- MESSAGE(FATAL_ERROR "Your system does not support getaddrinfo call, please consider upgrading it to run librdns")
- ENDIF(NOT HAVE_GETADDRINFO)
-
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-ENDIF(NOT SLAVE_BUILD)
-
-IF(ENABLE_CURVE MATCHES "ON")
- ADD_SUBDIRECTORY(contrib/tweetnacl)
- INCLUDE_DIRECTORIES("contrib/tweetnacl")
- SET(TWEETNACL 1)
- ADD_DEFINITIONS("-DTWEETNACL")
-ENDIF(ENABLE_CURVE MATCHES "ON")
-
-
 SET(LIBRDNSSRC src/util.c
  src/logger.c
  src/compression.c
@@ -48,24 +33,38 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/src"
  "${CMAKE_CURRENT_SOURCE_DIR}/contrib/tweetnacl")
 
 IF(NOT SLAVE_BUILD)
- ADD_SUBDIRECTORY(contrib/libottery)
-ENDIF(NOT SLAVE_BUILD)
-ADD_SUBDIRECTORY(test)
-
-ADD_LIBRARY(rdns_core OBJECT ${LIBRDNSSRC})
-SET_TARGET_PROPERTIES(rdns_core PROPERTIES COMPILE_FLAGS "-fPIC")
-
-SET(DLIBS "$<TARGET_OBJECTS:ottery>")
-IF(ENABLE_CURVE MATCHES "ON")
- LIST(APPEND DLIBS "$<TARGET_OBJECTS:tweetnacl>")
-ENDIF(ENABLE_CURVE MATCHES "ON")
+ CHECK_SYMBOL_EXISTS(IPV6_V6ONLY "sys/socket.h;netinet/in.h" HAVE_IPV6_V6ONLY)
+
+ CHECK_SYMBOL_EXISTS(getaddrinfo "sys/types.h;sys/socket.h;netdb.h" HAVE_GETADDRINFO)
+ IF(NOT HAVE_GETADDRINFO)
+ MESSAGE(FATAL_ERROR "Your system does not support getaddrinfo call, please consider upgrading it to run librdns")
+ ENDIF(NOT HAVE_GETADDRINFO)
+
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
 
-IF(NOT SLAVE_BUILD)
+ IF(ENABLE_CURVE MATCHES "ON")
+ ADD_SUBDIRECTORY(contrib/tweetnacl)
+ INCLUDE_DIRECTORIES("contrib/tweetnacl")
+ SET(TWEETNACL 1)
+ ADD_DEFINITIONS("-DTWEETNACL")
+ ENDIF(ENABLE_CURVE MATCHES "ON")
+
+ ADD_SUBDIRECTORY(contrib/libottery)
+ ADD_SUBDIRECTORY(test)
+
+ ADD_LIBRARY(rdns_core OBJECT ${LIBRDNSSRC})
+ SET_TARGET_PROPERTIES(rdns_core PROPERTIES COMPILE_FLAGS "-fPIC")
+
+ SET(DLIBS "$<TARGET_OBJECTS:ottery>")
+ IF(ENABLE_CURVE MATCHES "ON")
+ LIST(APPEND DLIBS "$<TARGET_OBJECTS:tweetnacl>")
+ ENDIF(ENABLE_CURVE MATCHES "ON")
+
  ADD_LIBRARY(rdns_static STATIC $<TARGET_OBJECTS:rdns_core> ${DLIBS})
  ADD_LIBRARY(rdns SHARED $<TARGET_OBJECTS:rdns_core> ${DLIBS})
  SET_TARGET_PROPERTIES(rdns PROPERTIES
  VERSION ${RDNS_VERSION_MAJOR}.${RDNS_VERSION_MINOR}.${RDNS_VERSION_PATCH}
  SOVERSION ${RDNS_VERSION_MINOR})
 ELSE(NOT SLAVE_BUILD)
- ADD_LIBRARY(rdns STATIC $<TARGET_OBJECTS:rdns_core>)
+ ADD_LIBRARY(rdns STATIC ${LIBRDNSSRC})
 ENDIF(NOT SLAVE_BUILD)