Merge pull request #200 from mlt/cmake

Cmake: fix static, precompiled headers, fix crypto++ include dir search

build/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required ( VERSION 2.8.5 )
+cmake_minimum_required ( VERSION 2.8.12 )
 project ( "i2pd" )
 
 # configurale options
@@ -8,6 +8,7 @@ option(WITH_LIBRARY   "Build library" ON)
 option(WITH_BINARY    "Build binary" ON)
 option(WITH_STATIC    "Static build" OFF)
 option(WITH_UPNP "Include support for UPnP client" OFF)
+option(WITH_PCH "Use precompiled header" OFF)
 
 # paths
 set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
@@ -82,15 +83,18 @@ source_group ("Header Files" FILES ${HEADERS})
 source_group ("Source Files" FILES ${COMMON_SRC} ${DAEMON_SRC} ${LIBRARY_SRC})
 
 # Default build is Debug
-if (CMAKE_BUILD_TYPE STREQUAL "Release")
+if (NOT CMAKE_BUILD_TYPE)
-  add_definitions( "-pedantic" )
-else ()
   set(CMAKE_BUILD_TYPE Debug)
 endif ()
 
 # compiler flags customization (by vendor)
 if (NOT MSVC)
-add_definitions ( "-Wall -Wextra -fPIC" )
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch" )
+  set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pedantic" )
+  # TODO: The following is incompatible with static build and enabled hardening for OpenWRT.
+  # Multiple definitions of __stack_chk_fail (libssp & libc)
+  set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -flto -s -ffunction-sections -fdata-sections" )
+  set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,--gc-sections" ) # -flto is added from above
 endif ()
 
 # check for c++11 support
@@ -136,12 +140,70 @@ if (WITH_AESNI)
 endif()
 
 # libraries
+# TODO: once CMake 3.1+ becomes mainstream, see e.g. http://stackoverflow.com/a/29871891/673826
+# use imported Threads::Threads instead
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package ( Threads REQUIRED )
+if(THREADS_HAVE_PTHREAD_ARG) # compile time flag
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
 
 if (WITH_STATIC)
   set(Boost_USE_STATIC_LIBS ON)
+  set(Boost_USE_STATIC_RUNTIME ON)
+  if (WIN32)
+    # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
+    # Note that you might need to rebuild Crypto++
+    foreach(flag_var
+            CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+            CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+      if(${flag_var} MATCHES "/MD")
+        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+      endif(${flag_var} MATCHES "/MD")
+    endforeach(flag_var)
+  else ()
+    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+  endif ()
+  set(BUILD_SHARED_LIBS OFF)
+  if (${CMAKE_CXX_COMPILER} MATCHES ".*-openwrt-.*")
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread" )
+    # set( CMAKE_THREAD_LIBS_INIT "gcc_eh -Wl,--whole-archive -lpthread -Wl,--no-whole-archive" )
+    set( CMAKE_THREAD_LIBS_INIT "gcc_eh -Wl,-u,pthread_create,-u,pthread_once,-u,pthread_mutex_lock,-u,pthread_mutex_unlock,-u,pthread_join,-u,pthread_equal,-u,pthread_detach,-u,pthread_cond_wait,-u,pthread_cond_signal,-u,pthread_cond_destroy,-u,pthread_cond_broadcast,-u,pthread_cancel" )
+  endif ()
+else()
+  if (NOT WIN32)
+    # TODO: Consider separate compilation for COMMON_SRC for library.
+    # No need in -fPIC overhead for binary if not interested in library
+    # HINT: revert c266cff CMakeLists.txt: compilation speed up
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
+  endif ()
+  add_definitions(-DBOOST_ALL_DYN_LINK)
 endif ()
 
+if (WITH_PCH)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+  add_library(stdafx STATIC "${CMAKE_SOURCE_DIR}/stdafx.cpp")
+  if(MSVC)
+    target_compile_options(stdafx PRIVATE /Ycstdafx.h /Zm135)
+    add_custom_command(TARGET stdafx POST_BUILD
+      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb common.dir\\$<CONFIG>\\
+      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb i2pd-bin.dir\\$<CONFIG>\\
+      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb i2pd.dir\\$<CONFIG>\\
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      )
+    target_compile_options(common PRIVATE /FIstdafx.h /Yustdafx.h /Zm135 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
+  else()
+    string(TOUPPER ${CMAKE_BUILD_TYPE} BTU)
+    get_directory_property(DEFS DEFINITIONS)
+    string(REPLACE " " ";" FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTU}} ${DEFS}")
+    add_custom_command(TARGET stdafx PRE_BUILD
+      COMMAND ${CMAKE_CXX_COMPILER} ${FLAGS} -c ${CMAKE_CURRENT_SOURCE_DIR}/../stdafx.h
+    )
+    target_compile_options(common PRIVATE -include stdafx.h)
+  endif()
+  target_link_libraries(common stdafx)
+endif()
+
 find_package ( Boost COMPONENTS system filesystem regex program_options date_time thread chrono REQUIRED )
 if(NOT DEFINED Boost_INCLUDE_DIRS)
   message(SEND_ERROR "Boost is not found, or your boost version was bellow 1.46. Please download Boost!")
@@ -158,7 +220,7 @@ if (NOT ${MINIUPNPC_FOUND})
 endif()
 
 # load includes
-include_directories( ${Boost_INCLUDE_DIRS} ${CRYPTO++_INCLUDE_DIR} "${CMAKE_SOURCE_DIR}/..")
+include_directories( ${Boost_INCLUDE_DIRS} ${CRYPTO++_INCLUDE_DIR} )
 
 # show summary
 message(STATUS "---------------------------------------")
@@ -174,6 +236,7 @@ message(STATUS "  LIBRARY          : ${WITH_LIBRARY}")
 message(STATUS "  BINARY           : ${WITH_BINARY}")
 message(STATUS "  STATIC BUILD     : ${WITH_STATIC}")
 message(STATUS "  UPnP             : ${WITH_UPNP}")
+message(STATUS "  PCH              : ${WITH_PCH}")
 message(STATUS "---------------------------------------")
 
 #Handle paths nicely
@@ -183,19 +246,28 @@ if (WITH_BINARY)
   add_executable ( "${PROJECT_NAME}-bin" ${DAEMON_SRC} )
  if(NOT MSVC) # FIXME: incremental linker file name (.ilk) collision for dll & exe
   set_target_properties("${PROJECT_NAME}-bin" PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+  if (WITH_STATIC)
+    set_target_properties("${PROJECT_NAME}-bin" PROPERTIES LINK_FLAGS "-static" )
+  endif ()
+ endif()
+
+  if (WITH_PCH)
+    if (MSVC)
+      target_compile_options("${PROJECT_NAME}-bin" PRIVATE /FIstdafx.h /Yustdafx.h /Zm135 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
+    else()
+      target_compile_options("${PROJECT_NAME}-bin" PRIVATE -include stdafx.h)
+    endif()
   endif()
 
   if (WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set_target_properties("${PROJECT_NAME}-bin" PROPERTIES LINK_FLAGS "-z relro -z now" )
   endif ()
 
-  if (WITH_STATIC)
+  # FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04
-    set(BUILD_SHARED_LIBS OFF)
+  list(GET Boost_LIBRARIES -1 LAST_Boost_LIBRARIES)
-    set_target_properties("${PROJECT_NAME}-bin" PROPERTIES LINK_FLAGS "-static" )
+  if(${LAST_Boost_LIBRARIES} MATCHES ".*pthread.*")
-  else()
+    list(REMOVE_AT Boost_LIBRARIES -1)
-    add_definitions(-DBOOST_ALL_DYN_LINK)
+  endif()
-  endif ()
-
   target_link_libraries( "${PROJECT_NAME}-bin" common ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
 
   install(TARGETS "${PROJECT_NAME}-bin" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
@@ -207,10 +279,18 @@ endif ()
 if (WITH_LIBRARY)
  if (MSVC)
   # FIXME: DLL would not have any symbols unless we use __declspec(dllexport) through out the code
-  add_library(${PROJECT_NAME} ${LIBRARY_SRC})
+  add_library(${PROJECT_NAME} STATIC ${LIBRARY_SRC})
  else ()
-  add_library(${PROJECT_NAME} SHARED ${LIBRARY_SRC})
+  add_library(${PROJECT_NAME} ${LIBRARY_SRC})
   target_link_libraries( ${PROJECT_NAME} common ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES})
  endif ()
+  if (WITH_PCH)
+    if (MSVC)
+      add_dependencies(${PROJECT_NAME} stdafx)
+      target_compile_options(${PROJECT_NAME} PRIVATE /FIstdafx.h /Yustdafx.h /Zm135 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
+    else()
+      target_compile_options(${PROJECT_NAME} PRIVATE -include stdafx.h)
+    endif()
+  endif()
   install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif ()

build/cmake_modules/FindCryptoPP.cmake

@@ -4,17 +4,14 @@ if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
    set(CRYPTO++_FOUND TRUE)
 
 else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-  find_path(CRYPTO++_INCLUDE_DIR cryptlib.h
+  find_path(CRYPTO++_INCLUDE_DIR cryptopp/cryptlib.h
-      /usr/include/crypto++
+      /usr/include
-      /usr/include/cryptopp
+      /usr/local/include
-      /usr/local/include/crypto++
-      /usr/local/include/cryptopp
-      /opt/local/include/crypto++
-      /opt/local/include/cryptopp
       $ENV{SystemDrive}/Crypto++/include
       $ENV{CRYPTOPP}
+      $ENV{CRYPTOPP}/..
       $ENV{CRYPTOPP}/include
-      ${PROJECT_SOURCE_DIR}/../../cryptopp
+      ${PROJECT_SOURCE_DIR}/../..
       )
 
   find_library(CRYPTO++_LIBRARIES NAMES cryptopp

stdafx.cpp

@@ -0,0 +1 @@
+#include "stdafx.h"

stdafx.h

@@ -0,0 +1,67 @@
+#ifndef STDAFX_H__
+#define STDAFX_H__
+
+#include <inttypes.h>
+#include <stdlib.h>
+#include <cassert>
+#include <time.h>
+#include <stdio.h>
+
+#include <string.h> // TODO: replace with cstring and std::<old func> through out
+#include <string>
+#include <cstring>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+#include <functional>
+#include <algorithm>
+#include <atomic>
+#include <utility>
+#include <cctype>
+#include <condition_variable>
+#include <chrono>
+
+#include <set>
+#include <map>
+#include <memory>
+#include <queue>
+#include <vector>
+
+#include <thread>
+#include <mutex>
+
+#include <boost/asio.hpp>
+#include <boost/regex.hpp>
+#include <boost/bind.hpp>
+#include <boost/date_time/local_time/local_time.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ini_parser.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/foreach.hpp>
+#include <boost/program_options/detail/config_file.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include <cryptopp/aes.h>
+#include <cryptopp/adler32.h>
+#include <cryptopp/asn.h>
+#include <cryptopp/base64.h>
+#include <cryptopp/crc.h>
+#include <cryptopp/dh.h>
+#include <cryptopp/dsa.h>
+#include <cryptopp/eccrypto.h>
+#include <cryptopp/gzip.h>
+#include <cryptopp/hmac.h>
+#include <cryptopp/integer.h>
+#include <cryptopp/modes.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/sha.h>
+#include <cryptopp/zinflate.h>
+
+#endif