Require CMake 3.16, drop cotire

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.16)
 project (airdcpp-webclient)
 
 if (APPLE)
@@ -22,7 +22,6 @@ include (CheckFunctionExists)
 include (FindPkgConfig)
 include (CheckCXXSourceCompiles)
 include (cmake/CheckAtomic.cmake)
-include (cmake/cotire.cmake)
 
 
 # PRE-CHECKS

airdcpp-core/CMakeLists.txt

@@ -1,6 +1,6 @@
 project (airdcpp)
 include_directories(${PROJECT_BINARY_DIR})
-cmake_minimum_required (VERSION 3.0.2)
+cmake_minimum_required (VERSION 3.16)
 
 aux_source_directory(${PROJECT_SOURCE_DIR}/airdcpp airdcpp_srcs)
 file (GLOB airdcpp_hdrs ${PROJECT_SOURCE_DIR}/airdcpp/*.h)
@@ -88,11 +88,14 @@ ${OPENSSL_LIBRARIES} ${ICONV_LIBRARIES} ${airdcpp_extra_libs} ${UPNP} ${Boost_LI
 
 set_target_properties(airdcpp PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "airdcpp")
 
-set_target_properties(airdcpp PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "airdcpp/stdinc.h")
-if (COMMAND cotire)
-  cotire(airdcpp)
-endif()
-
+#set_target_properties(airdcpp PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "airdcpp/stdinc.h")
+#if (COMMAND cotire)
+#  cotire(airdcpp)
+#endif()
+target_precompile_headers(airdcpp PUBLIC
+  "$<$<COMPILE_LANGUAGE:CXX>:stdinc.h>"
+  #"$<$<COMPILE_LANGUAGE:CXX>:<airdcpp/stdinc.h$<ANGLE-R>>"
+)
 
 
 #if (WIN32)

airdcpp-webapi/CMakeLists.txt

@@ -1,5 +1,5 @@
 project(airdcpp-webapi)
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.16)
 # ######### General setup ##########
 
 file (GLOB webapi_hdrs ${PROJECT_SOURCE_DIR}/*.h)
@@ -20,10 +20,15 @@ endif()
 target_link_libraries (airdcpp-webapi airdcpp ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES})
 set_target_properties(airdcpp-webapi PROPERTIES VERSION ${SOVERSION} OUTPUT_NAME "airdcpp-webapi")
 
-set_target_properties(airdcpp-webapi PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdinc.h")
-if (COMMAND cotire)
-  cotire(airdcpp-webapi)
-endif()
+#set_target_properties(airdcpp-webapi PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdinc.h")
+#if (COMMAND cotire)
+#  cotire(airdcpp-webapi)
+#endif()
+
+target_precompile_headers(airdcpp-webapi PUBLIC
+  "$<$<COMPILE_LANGUAGE:CXX>:stdinc.h>"
+  "$<$<COMPILE_LANGUAGE:CXX>:<airdcpp/stdinc.h$<ANGLE-R>>"
+)
 
 if (APPLE)
   set (LIBDIR1 .)

airdcppd/CMakeLists.txt

@@ -1,8 +1,8 @@
 project(airdcppd)
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.16)
 
 aux_source_directory(${PROJECT_SOURCE_DIR} airdcppd_SRCS)
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS} ${websocketpp_INCLUDE_DIR})
 
 if (Backtrace_FOUND)
   set_property(SOURCE ${PROJECT_SOURCE_DIR}/main.cpp PROPERTY COMPILE_DEFINITIONS USE_STACKTRACE)