--- CMakeLists.txt.orig	2015-04-19 21:57:16 UTC
+++ CMakeLists.txt
@@ -1,5 +1,5 @@ project (eiskaltdcpp)
 project (eiskaltdcpp)
-cmake_minimum_required (VERSION 2.6.3)
+cmake_minimum_required (VERSION 3.10)
 
 if (APPLE)
   set (PROJECT_NAME_GLOBAL EiskaltDC++)
@@ -175,9 +175,6 @@ else (LOCAL_BOOST)
     if (Boost_VERSION VERSION_LESS 104200)
         add_definitions(-DTIMER_OLD_BOOST)
     endif()
-    if (Boost_VERSION VERSION_GREATER 105000)
-        find_package(Boost COMPONENTS system REQUIRED)
-    endif()
     if (Boost_VERSION VERSION_LESS 105300 AND WIN32)
         add_definitions(-DFIX_FOR_OLD_BOOST)
     endif()
@@ -284,7 +281,9 @@ endif ()
     endif ()
 endif ()
 
-include_directories(${eiskaltdcpp_BINARY_DIR}
+include_directories(
+   ${EISKALTDCPP_INCLUDE_DIR}
+   ${eiskaltdcpp_BINARY_DIR}
    ${eiskaltdcpp_SOURCE_DIR}
    ${GMP_INCLUDE_DIR}
    )
@@ -338,13 +337,17 @@ add_subdirectory(extra)
 endif (WIN32 OR HAIKU)
 
 add_subdirectory(extra)
-add_subdirectory(data)
+if (INSTALL_DATA)
+	add_subdirectory(data)
+endif (INSTALL_DATA)
 
 if (WITH_DHT)
   add_subdirectory (dht)
 endif (WITH_DHT)
 
-add_subdirectory (dcpp)
+if (BUILD_LIB)
+	add_subdirectory (dcpp)
+endif (BUILD_LIB)
 
 if (HAIKU AND HAIKU_PKG)
   add_subdirectory (haiku)