[cmake] remove windows build support (#1517)

Removes support for MSVC, MSYS, MinGW and included NSIS installer in cmake
5 years ago · db6a0e6ad9
3 changed files with 152 additions and 401 deletions
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@ -1,28 +1,32 @@
				@@ -1,28 +1,32 @@
-cmake_minimum_required ( VERSION 2.8.12 )
+cmake_minimum_required(VERSION 2.8.12)
 # this addresses CMP0059 with CMake > 3.3 for PCH flags
-cmake_policy( VERSION 2.8.12 )
-project ( "i2pd" )
+cmake_policy(VERSION 2.8.12)
+project("i2pd")

 # for debugging
 #set(CMAKE_VERBOSE_MAKEFILE on)

+# Win32 build with cmake is not supported
+if(WIN32 OR MSVC OR MSYS OR MINGW)
+  message(SEND_ERROR "cmake build for windows is not supported. Please use MSYS2 with makefiles in project root.")
+endif()
+
 # configurale options
-option(WITH_AESNI     "Use AES-NI instructions set" OFF)
-option(WITH_AVX       "Use AVX instructions" OFF)
-option(WITH_HARDENING "Use hardening compiler flags" OFF)
-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)
-option(WITH_GUI "Include GUI (currently MS Windows only)" ON)
-option(WITH_MESHNET "Build for cjdns test network" OFF)
-option(WITH_ADDRSANITIZER "Build with address sanitizer unix only" OFF)
-option(WITH_THREADSANITIZER "Build with thread sanitizer unix only" OFF)
+option(WITH_AESNI           "Use AES-NI instructions set"             OFF)
+option(WITH_AVX             "Use AVX instructions"                    OFF)
+option(WITH_HARDENING       "Use hardening compiler flags"            OFF)
+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)
+option(WITH_MESHNET         "Build for cjdns test network"            OFF)
+option(WITH_ADDRSANITIZER   "Build with address sanitizer unix only"  OFF)
+option(WITH_THREADSANITIZER "Build with thread sanitizer unix only"   OFF)

 # paths
-set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
-set ( CMAKE_SOURCE_DIR ".." )
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
+set(CMAKE_SOURCE_DIR "..")

 # architecture
 include(TargetArch)
@ -30,67 +34,65 @@ target_architecture(ARCHITECTURE)
				@@ -30,67 +34,65 @@ target_architecture(ARCHITECTURE)

 set(LIBI2PD_SRC_DIR ../libi2pd)
 set(LIBI2PD_CLIENT_SRC_DIR ../libi2pd_client)
+set(DAEMON_SRC_DIR ../daemon)

 include_directories(${LIBI2PD_SRC_DIR})
 include_directories(${LIBI2PD_CLIENT_SRC_DIR})
+include_directories(${DAEMON_SRC_DIR})

-set (LIBI2PD_SRC
+set(LIBI2PD_SRC
+  "${LIBI2PD_SRC_DIR}/api.cpp"
+  "${LIBI2PD_SRC_DIR}/Base.cpp"
+  "${LIBI2PD_SRC_DIR}/Blinding.cpp"
  "${LIBI2PD_SRC_DIR}/BloomFilter.cpp"
+  "${LIBI2PD_SRC_DIR}/ChaCha20.cpp"
  "${LIBI2PD_SRC_DIR}/Config.cpp"
  "${LIBI2PD_SRC_DIR}/CPU.cpp"
  "${LIBI2PD_SRC_DIR}/Crypto.cpp"
  "${LIBI2PD_SRC_DIR}/CryptoKey.cpp"
+  "${LIBI2PD_SRC_DIR}/Datagram.cpp"
+  "${LIBI2PD_SRC_DIR}/Destination.cpp"
+  "${LIBI2PD_SRC_DIR}/ECIESX25519AEADRatchetSession.cpp"
+  "${LIBI2PD_SRC_DIR}/Ed25519.cpp"
+  "${LIBI2PD_SRC_DIR}/Elligator.cpp"
+  "${LIBI2PD_SRC_DIR}/Family.cpp"
+  "${LIBI2PD_SRC_DIR}/FS.cpp"
  "${LIBI2PD_SRC_DIR}/Garlic.cpp"
+  "${LIBI2PD_SRC_DIR}/Gost.cpp"
  "${LIBI2PD_SRC_DIR}/Gzip.cpp"
  "${LIBI2PD_SRC_DIR}/HTTP.cpp"
  "${LIBI2PD_SRC_DIR}/I2NPProtocol.cpp"
  "${LIBI2PD_SRC_DIR}/Identity.cpp"
  "${LIBI2PD_SRC_DIR}/LeaseSet.cpp"
-  "${LIBI2PD_SRC_DIR}/FS.cpp"
  "${LIBI2PD_SRC_DIR}/Log.cpp"
-  "${LIBI2PD_SRC_DIR}/NTCPSession.cpp"
-  "${LIBI2PD_SRC_DIR}/NetDbRequests.cpp"
  "${LIBI2PD_SRC_DIR}/NetDb.cpp"
+  "${LIBI2PD_SRC_DIR}/NetDbRequests.cpp"
+  "${LIBI2PD_SRC_DIR}/NTCP2.cpp"
+  "${LIBI2PD_SRC_DIR}/NTCPSession.cpp"
+  "${LIBI2PD_SRC_DIR}/Poly1305.cpp"
  "${LIBI2PD_SRC_DIR}/Profiling.cpp"
  "${LIBI2PD_SRC_DIR}/Reseed.cpp"
  "${LIBI2PD_SRC_DIR}/RouterContext.cpp"
  "${LIBI2PD_SRC_DIR}/RouterInfo.cpp"
+  "${LIBI2PD_SRC_DIR}/Signature.cpp"
  "${LIBI2PD_SRC_DIR}/SSU.cpp"
  "${LIBI2PD_SRC_DIR}/SSUData.cpp"
  "${LIBI2PD_SRC_DIR}/SSUSession.cpp"
  "${LIBI2PD_SRC_DIR}/Streaming.cpp"
-  "${LIBI2PD_SRC_DIR}/Destination.cpp"
+  "${LIBI2PD_SRC_DIR}/Timestamp.cpp"
  "${LIBI2PD_SRC_DIR}/TransitTunnel.cpp"
-  "${LIBI2PD_SRC_DIR}/Tunnel.cpp"
-  "${LIBI2PD_SRC_DIR}/TunnelGateway.cpp"
  "${LIBI2PD_SRC_DIR}/Transports.cpp"
+  "${LIBI2PD_SRC_DIR}/Tunnel.cpp"
  "${LIBI2PD_SRC_DIR}/TunnelEndpoint.cpp"
+  "${LIBI2PD_SRC_DIR}/TunnelGateway.cpp"
  "${LIBI2PD_SRC_DIR}/TunnelPool.cpp"
-  "${LIBI2PD_SRC_DIR}/Base.cpp"
  "${LIBI2PD_SRC_DIR}/util.cpp"
-  "${LIBI2PD_SRC_DIR}/Datagram.cpp"
-  "${LIBI2PD_SRC_DIR}/Family.cpp"
-  "${LIBI2PD_SRC_DIR}/Signature.cpp"
-  "${LIBI2PD_SRC_DIR}/Timestamp.cpp"
-  "${LIBI2PD_SRC_DIR}/api.cpp"
-  "${LIBI2PD_SRC_DIR}/Gost.cpp"
-  "${LIBI2PD_SRC_DIR}/ChaCha20.cpp"
-  "${LIBI2PD_SRC_DIR}/Poly1305.cpp"
-  "${LIBI2PD_SRC_DIR}/Ed25519.cpp"
-  "${LIBI2PD_SRC_DIR}/NTCP2.cpp"
-  "${LIBI2PD_SRC_DIR}/Blinding.cpp"
-  "${LIBI2PD_SRC_DIR}/Elligator.cpp"
-  "${LIBI2PD_SRC_DIR}/ECIESX25519AEADRatchetSession.cpp"    
 )

-if (WIN32 OR MSYS)
-  list (APPEND LIBI2PD_SRC "${CMAKE_SOURCE_DIR}/I2PEndian.cpp")
-endif ()
-
 add_library(libi2pd ${LIBI2PD_SRC})
 set_target_properties(libi2pd PROPERTIES PREFIX "")

-if (WITH_LIBRARY)
+if(WITH_LIBRARY)
  install(TARGETS libi2pd
    EXPORT libi2pd
    ARCHIVE DESTINATION lib
@ -101,7 +103,7 @@ if (WITH_LIBRARY)
				@@ -101,7 +103,7 @@ if (WITH_LIBRARY)
 # install(EXPORT libi2pd DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

-set (CLIENT_SRC
+set(CLIENT_SRC
  "${LIBI2PD_CLIENT_SRC_DIR}/AddressBook.cpp"
  "${LIBI2PD_CLIENT_SRC_DIR}/BOB.cpp"
  "${LIBI2PD_CLIENT_SRC_DIR}/ClientContext.cpp"
@ -117,7 +119,7 @@ set (CLIENT_SRC
				@@ -117,7 +119,7 @@ set (CLIENT_SRC
 add_library(libi2pdclient ${CLIENT_SRC})
 set_target_properties(libi2pdclient PROPERTIES PREFIX "")

-if (WITH_LIBRARY)
+if(WITH_LIBRARY)
  install(TARGETS libi2pdclient
    EXPORT libi2pdclient
    ARCHIVE DESTINATION lib
@ -125,9 +127,7 @@ if (WITH_LIBRARY)
				@@ -125,9 +127,7 @@ if (WITH_LIBRARY)
    COMPONENT Libraries)
 endif()

-set(DAEMON_SRC_DIR ../daemon)
-
-set (DAEMON_SRC
+set(DAEMON_SRC
  "${DAEMON_SRC_DIR}/Daemon.cpp"
  "${DAEMON_SRC_DIR}/HTTPServer.cpp"
  "${DAEMON_SRC_DIR}/I2PControl.cpp"
@ -135,37 +135,20 @@ set (DAEMON_SRC
				@@ -135,37 +135,20 @@ set (DAEMON_SRC
  "${DAEMON_SRC_DIR}/UPnP.cpp"
 )

-if (WITH_MESHNET)
+if(WITH_MESHNET)
  add_definitions(-DMESHNET)
-endif ()
+endif()

-if (WITH_UPNP)
+if(WITH_UPNP)
  add_definitions(-DUSE_UPNP)
-  if (NOT MSVC AND NOT MSYS)
-    set(DL_LIB ${CMAKE_DL_LIBS})
-  endif ()
-endif ()
-
-# compiler flags customization (by vendor)
-if (MSVC)
-  add_definitions( -DWIN32_LEAN_AND_MEAN -DNOMINMAX )
-  # TODO Check & report to Boost dev, there should be no need for these two
-  add_definitions( -DBOOST_THREAD_NO_LIB -DBOOST_CHRONO_NO_LIB )
-  set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL" )
-  set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /INCREMENTAL:NO /LTCG" )
-  set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /GL" )
-  set( CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO /LTCG" )
-else()
-  if (MSYS OR MINGW)
-    add_definitions( -DWIN32_LEAN_AND_MEAN )
-  endif ()
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter" )
-  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 ()
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter")
+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

 # check for c++17 & c++11 support
 include(CheckCXXCompilerFlag)
@ -179,72 +162,53 @@ else()
				@@ -179,72 +162,53 @@ else()
  message(SEND_ERROR "C++17 nor C++11 standard not seems to be supported by compiler. Too old version?")
 endif()

-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
-  if (WITH_HARDENING)
-    add_definitions( "-D_FORTIFY_SOURCE=2" )
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security -Werror=format-security" )
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param ssp-buffer-size=4" )
-  endif ()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
+  if(WITH_HARDENING)
+    add_definitions("-D_FORTIFY_SOURCE=2")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security -Werror=format-security")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param ssp-buffer-size=4")
+  endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
  # more tweaks
-  if (LINUX)
-    set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -stdlib=libstdc++" ) # required for <atomic>
+  if(LINUX)
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -stdlib=libstdc++") # required for <atomic>
    list(APPEND CMAKE_REQUIRED_LIBRARIES "stdc++") # required to link with -stdlib=libstdc++
  endif()
-  if (NOT (MSVC OR MSYS OR APPLE))
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-const-variable -Wno-overloaded-virtual -Wno-c99-extensions" )
+  if(NOT APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-const-variable -Wno-overloaded-virtual -Wno-c99-extensions")
  endif()
-endif ()
-
-if (WITH_HARDENING AND MSVC)
-  # Most security options like dynamic base, buffer & stack checks are ON by default
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf" )
-endif ()
+endif()

-# compiler flags customization (by system)
-if (UNIX)
-  list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
-  if (NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR APPLE))
+# compiler flags customization(by system)
+if(UNIX)
+  list(APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
+  if(NOT(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR APPLE))
    # "'sleep_for' is not a member of 'std::this_thread'" in gcc 4.7/4.8
-    add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
-  endif ()
-elseif (WIN32 OR MSYS)
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/DaemonWin32.cpp")
-  if (WITH_GUI)
-    list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32App.cpp")
-    set_source_files_properties("${CMAKE_SOURCE_DIR}/Win32/DaemonWin32.cpp"
-      PROPERTIES COMPILE_DEFINITIONS WIN32_APP)
-  endif ()
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32Service.cpp")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Resource.rc")
-endif ()
-
-if (WITH_AESNI)
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes" )
+    add_definitions("-D_GLIBCXX_USE_NANOSLEEP=1")
+  endif()
 endif()

-if (WITH_AVX)
-  set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx" )
+if(WITH_AESNI)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+  add_definitions(-DAESNI)
 endif()

-if (WITH_ADDRSANITIZER)
-  if (NOT MSVC)
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer" )
-    set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address" )
-  else ()
-    message( SEND_ERROR "MSVC does not support address sanitizer option")
-  endif()
+if(WITH_AVX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+endif()
+
+if(WITH_ADDRSANITIZER)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
 endif()

-if (WITH_THREADSANITIZER)
-  if (WITH_ADDRSANITIZER)
-    message( FATAL_ERROR "thread sanitizer option cannot be combined with address sanitizer")
-  elseif (NOT MSVC)
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread" )
-    set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread" )
-  else ()
-    message( SEND_ERROR "MSVC does not support address sanitizer option")
+if(WITH_THREADSANITIZER)
+  if(WITH_ADDRSANITIZER)
+    message(FATAL_ERROR "thread sanitizer option cannot be combined with address sanitizer")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
  endif()
 endif()

@ -253,141 +217,87 @@ endif()
				@@ -253,141 +217,87 @@ endif()
 # 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)
-if (IOS)
+if(IOS)
  set(CMAKE_THREAD_LIBS_INIT "-lpthread")
  set(CMAKE_HAVE_THREADS_LIBRARY 1)
  set(CMAKE_USE_WIN32_THREADS_INIT 0)
  set(CMAKE_USE_PTHREADS_INIT 1)
 else()
-  find_package ( Threads REQUIRED )
+  find_package(Threads REQUIRED)
 endif()
 if(THREADS_HAVE_PTHREAD_ARG) # compile time flag
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 endif()

-if (WITH_STATIC)
+if(WITH_STATIC)
  set(Boost_USE_STATIC_LIBS ON)
  set(Boost_USE_STATIC_RUNTIME ON)
-  if (WIN32 AND NOT MSYS AND NOT MINGW)
-    # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
-    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 ()
+  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 AND NOT MSYS)
-    # TODO: Consider separate compilation for LIBI2PD_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 ()
+  # TODO: Consider separate compilation for LIBI2PD_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")
  add_definitions(-DBOOST_SYSTEM_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_REGEX_DYN_LINK)
-endif ()
+endif()

-if (WITH_PCH)
+if(WITH_PCH)
  include_directories(BEFORE ${CMAKE_BINARY_DIR})
  add_library(stdafx STATIC "${LIBI2PD_SRC_DIR}/stdafx.cpp")
-  if(MSVC)
-    target_compile_options(stdafx PRIVATE /Ycstdafx.h /Zm155)
-    add_custom_command(TARGET stdafx POST_BUILD
-      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb libi2pd.dir\\$<CONFIG>\\
-      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb i2pdclient.dir\\$<CONFIG>\\
-      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb i2pd.dir\\$<CONFIG>\\
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      )
-    target_compile_options(libi2pd PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
-    target_compile_options(libi2pdclient PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/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}/../libi2pd/stdafx.h -o ${CMAKE_BINARY_DIR}/stdafx.h.gch
-    )
-    target_compile_options(libi2pd PRIVATE -include libi2pd/stdafx.h)
-    target_compile_options(libi2pdclient PRIVATE -include libi2pd/stdafx.h)
-  endif()
+  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}/../libi2pd/stdafx.h -o ${CMAKE_BINARY_DIR}/stdafx.h.gch
+  )
+  target_compile_options(libi2pd PRIVATE -include libi2pd/stdafx.h)
+  target_compile_options(libi2pdclient PRIVATE -include libi2pd/stdafx.h)
  target_link_libraries(libi2pd stdafx)
 endif()

 target_link_libraries(libi2pdclient libi2pd)

-find_package ( Boost COMPONENTS system filesystem program_options date_time REQUIRED )
+find_package(Boost COMPONENTS system filesystem program_options date_time REQUIRED)
 if(NOT DEFINED Boost_INCLUDE_DIRS)
  message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!")
 endif()

-find_package ( OpenSSL REQUIRED )
+find_package(OpenSSL REQUIRED)
 if(NOT DEFINED OPENSSL_INCLUDE_DIR)
  message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")
 endif()

-if (WITH_UPNP)
-  find_package ( MiniUPnPc REQUIRED )
-  include_directories( SYSTEM ${MINIUPNPC_INCLUDE_DIR} )
-endif()
-
-find_package ( ZLIB )
-if (NOT ZLIB_FOUND )
-  # We are probably on Windows
-  find_program( PATCH patch C:/Program Files/Git/usr/bin C:/msys64/usr/bin C:/msys32/usr/bin C:/Strawberry/c/bin )
-  include( ExternalProject )
-  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-    set( ZLIB_EXTRA -DAMD64=ON )
+if(WITH_UPNP)
+  find_package(MiniUPnPc REQUIRED)
+  if(NOT MINIUPNPC_FOUND)
+    message(SEND_ERROR "Could not find MiniUPnPc. Please download and install it first!")
  else()
-    set( ZLIB_EXTRA -DASM686=ON "-DCMAKE_ASM_MASM_FLAGS=/W0 /safeseh" )
+    include_directories(SYSTEM ${MINIUPNPC_INCLUDE_DIR})
  endif()
-  ExternalProject_Add(zlib-project
-    URL https://zlib.net/zlib-1.2.11.tar.gz
-    URL_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/zlib
-    PATCH_COMMAND "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-static.patch
-      && "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-amd64.patch
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-      -DWITH_STATIC=${WITH_STATIC} ${ZLIB_EXTRA}
-    )
-  if (WITH_PCH)
-    add_dependencies( stdafx zlib-project )
-  else ()
-    add_dependencies( libi2pd zlib-project )
-  endif ()
-  # ExternalProject_Get_Property(zlib-project install_dir)
-  set ( ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/zlib/include" CACHE FILEPATH "zlib include dir" FORCE)
-  if (NOT WITH_STATIC)
-    set ( ZLIB_LIBRARY debug zlibd optimized zlib CACHE STRING "zlib libraries" FORCE)
-  endif ()
-  link_directories(${CMAKE_CURRENT_BINARY_DIR}/zlib/lib)
-else()
+endif()
+
+find_package(ZLIB)
+if(ZLIB_FOUND)
  link_directories(${ZLIB_ROOT}/lib)
-endif ()
-if (WITH_STATIC AND (MSVC OR MSYS))
-  set ( ZLIB_LIBRARY debug zlibstaticd optimized zlibstatic CACHE STRING "zlib libraries" FORCE)
-endif ()
+endif()

 # load includes
-include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
-
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})

 # warn if for meshnet
-if (WITH_MESHNET)
+if(WITH_MESHNET)
  message(STATUS "Building for testnet")
  message(WARNING "This build will NOT work on mainline i2p")
 endif()

-include(CheckAtomic)
-
+if(NOT MSYS)
+  include(CheckAtomic)
+endif()

 # show summary
 message(STATUS "---------------------------------------")
@ -414,32 +324,24 @@ message(STATUS "---------------------------------------")
				@@ -414,32 +324,24 @@ message(STATUS "---------------------------------------")
 #Handle paths nicely
 include(GNUInstallDirs)

-if (WITH_BINARY)
-  add_executable ( "${PROJECT_NAME}" ${DAEMON_SRC} )
-  if (WIN32 AND WITH_GUI)
-    set_target_properties("${PROJECT_NAME}" PROPERTIES WIN32_EXECUTABLE TRUE )
-  endif()
-  if(NOT MSVC)
-    if (WITH_STATIC)
-      set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-static" )
-    endif ()
+if(WITH_BINARY)
+  add_executable("${PROJECT_NAME}" ${DAEMON_SRC})
+
+  if(WITH_STATIC)
+    set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-static")
  endif()

-  if (WITH_PCH)
-    if (MSVC)
-      target_compile_options("${PROJECT_NAME}" PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
-    else()
-      target_compile_options("${PROJECT_NAME}" PRIVATE -include libi2pd/stdafx.h)
-    endif()
+  if(WITH_PCH)
+    target_compile_options("${PROJECT_NAME}" PRIVATE -include libi2pd/stdafx.h)
  endif()

-  if (WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT MSYS AND NOT MINGW)
-    set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-z relro -z now" )
-  endif ()
+  if(WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-z relro -z now")
+  endif()

-  if (WITH_UPNP)
-	  target_link_libraries("${PROJECT_NAME}" "${MINIUPNPC_LIBRARY}")
-  endif ()
+  if(WITH_UPNP)
+    set(UPNP_LIB ${MINIUPNPC_LIBRARY})
+  endif()

  # FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04
  list(GET Boost_LIBRARIES -1 LAST_Boost_LIBRARIES)
@ -447,128 +349,15 @@ if (WITH_BINARY)
				@@ -447,128 +349,15 @@ if (WITH_BINARY)
    list(REMOVE_AT Boost_LIBRARIES -1)
  endif()

-  if (MSYS OR MINGW)
-    set (MINGW_EXTRA -lws2_32 -lmswsock -liphlpapi )
-  endif ()
-  if (WITH_STATIC)
+
+  if(WITH_STATIC)
    set(DL_LIB ${CMAKE_DL_LIBS})
  endif()
+
  target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY})
-  target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
+  target_link_libraries("${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${UPNP_LIB} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})

  install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
-  set (APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
-  set (DIRS "${Boost_LIBRARY_DIR};${OPENSSL_INCLUDE_DIR}/../bin;${ZLIB_INCLUDE_DIR}/../bin;/mingw32/bin")
-  if (MSVC)
-    install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS DEBUG RELWITHDEBINFO COMPONENT Symbols)
-    # TODO Somehow this picks lots of unrelevant stuff with MSYS. OS X testing needed.
-    INSTALL(CODE "
-      include(BundleUtilities)
-      fixup_bundle(\"${APPS}\"   \"\"   \"${DIRS}\")
-      " COMPONENT Runtime)
-  endif ()
-endif ()
-
-install(FILES ../LICENSE
-  DESTINATION .
-  COMPONENT Runtime
-  )
-# Take a copy on Appveyor
-install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
-  DESTINATION .
-  COMPONENT Runtime
-  RENAME LICENSE_OPENSSL
-  OPTIONAL                      # for local builds only!
-  )
-
-file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*")
-install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
-# install(DIRECTORY ../ DESTINATION src/
-#   # OPTIONAL
-#   COMPONENT Source FILES_MATCHING
-#   PATTERN .git EXCLUDE
-#   PATTERN "*.cpp"
-#   )
-
-file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h")
-install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
-# install(DIRECTORY ../ DESTINATION src/
-#   # OPTIONAL
-#   COMPONENT Headers FILES_MATCHING
-#   PATTERN .git EXCLUDE
-#   PATTERN "*.h"
-#   )
-
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Purple I2P, a C++ I2P daemon")
-set(CPACK_PACKAGE_VENDOR "Purple I2P")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE")
-file(READ ../libi2pd/version.h version_h)
-string(REGEX REPLACE ".*I2PD_VERSION_MAJOR ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MAJOR "${version_h}")
-string(REGEX REPLACE ".*I2PD_VERSION_MINOR ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MINOR "${version_h}")
-string(REGEX REPLACE ".*I2PD_VERSION_MICRO ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MICRO "${version_h}")
-string(REGEX REPLACE ".*I2PD_VERSION_PATCH ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_PATCH "${version_h}")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "Purple I2P")# ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-include(CPackComponent)
-cpack_add_component(Runtime
-  DESCRIPTION "Main files"
-  REQUIRED INSTALL_TYPES minimal)
-cpack_add_component(Symbols
-  DISPLAY_NAME "Debug symbols"
-  DESCRIPTION "Debug symbols for use with WinDbg or Visual Studio"
-  INSTALL_TYPES recommended full
-  )
-cpack_add_component(Libraries
-  DESCRIPTION "Binary libraries for development"
-  INSTALL_TYPES full dev3rd
-  )
-cpack_add_component(Source
-  DISPLAY_NAME "Source code"
-  DESCRIPTION "I2pd source code"
-  INSTALL_TYPES full
-  )
-cpack_add_component(Headers
-  DISPLAY_NAME "Header files"
-  DESCRIPTION "I2pd header files for development"
-  INSTALL_TYPES full dev3rd
-  )
-install(FILES ${MINIUPNPC_INCLUDE_DIR}/miniupnpc/miniupnpc.dll
-  DESTINATION bin
-  COMPONENT MiniUPnPc
-  OPTIONAL
-  )
-install(FILES ${MINIUPNPC_INCLUDE_DIR}/miniupnpc/LICENSE
-  DESTINATION .
-  COMPONENT MiniUPnPc
-  RENAME LICENSE_MINIUPNPC
-  OPTIONAL
-  )
-cpack_add_component(MiniUPnPc
-  INSTALL_TYPES full recommended
-  # DOWNLOADED
-  # ARCHIVE_FILE miniupnpc-win32.zip
-  )
-cpack_add_install_type(recommended DISPLAY_NAME Recommended)
-cpack_add_install_type(dev3rd DISPLAY_NAME "Third party development")
-cpack_add_install_type(full DISPLAY_NAME Full)
-cpack_add_install_type(minimal DISPLAY_NAME Minimal)
-if((WIN32 OR MSYS) AND NOT UNIX)
-  # There is a bug in NSI that does not handle full unix paths properly. Make
-  # sure there is at least one set of four (4) backlasshes.
-  set(CPACK_NSIS_DEFINES "RequestExecutionLevel user")
-  set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/../Win32\\\\mask.bmp")
-  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin/i2pd.exe")
-  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-  set(CPACK_NSIS_HELP_LINK "https:\\\\\\\\github.com\\\\PurpleI2P\\\\i2pd\\\\issues")
-  set(CPACK_NSIS_URL_INFO_ABOUT "https:\\\\\\\\github.com\\\\PurpleI2P\\\\i2pd")
-  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Install i2pd as windows service.lnk' '$INSTDIR\\\\bin\\\\i2pd.exe' '--service=install'
-CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Remove i2pd windows service.lnk' '$INSTDIR\\\\bin\\\\i2pd.exe' '--service=remove'")
-  set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Install i2pd as windows service.lnk'
-Delete '$SMPROGRAMS\\\\$START_MENU\\\\Remove i2pd windows service.lnk'")
-else()
-  set(CPACK_STRIP_FILES "bin/i2pd")
-  set(CPACK_SOURCE_STRIP_FILES "")
+  set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
+  set(DIRS "${Boost_LIBRARY_DIR};${OPENSSL_INCLUDE_DIR}/../bin;${ZLIB_INCLUDE_DIR}/../bin;/mingw32/bin")
 endif()
-set(CPACK_PACKAGE_EXECUTABLES "i2pd" "C++ I2P daemon")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-include(CPack)
--- a/build/cmake-zlib-amd64.patch
+++ b/build/cmake-zlib-amd64.patch
@ -1,10 +0,0 @@
				@@ -1,10 +0,0 @@
--- CMakeLists.txt.orig	2015-12-07 14:19:36.447689600 -0600
-+++ CMakeLists.txt	2015-12-07 14:18:23.004419900 -0600
-@@ -165,6 +165,7 @@
- 		ENABLE_LANGUAGE(ASM_MASM)
-         set(ZLIB_ASMS
- 			contrib/masmx64/gvmat64.asm
-+			contrib/masmx64/inffas8664.c
- 			contrib/masmx64/inffasx64.asm
- 		)
-     endif()
--- a/build/cmake-zlib-static.patch
+++ b/build/cmake-zlib-static.patch
@ -1,28 +0,0 @@
				@@ -1,28 +0,0 @@
--- CMakeLists.txt.orig	2013-04-28 17:57:10.000000000 -0500
-+++ CMakeLists.txt	2015-12-03 12:53:52.371087900 -0600
-@@ -7,6 +7,7 @@
- 
- option(ASM686 "Enable building i686 assembly implementation")
- option(AMD64 "Enable building amd64 assembly implementation")
-+option(WITH_STATIC    "Static runtime on Windows" OFF)
- 
- set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
- set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-@@ -66,6 +67,17 @@
-     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- endif()
- 
-+if(WITH_STATIC AND (MSVC OR MSYS))
-+    # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
-+    foreach(flag_var
-+            CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-+            CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-+      if(${flag_var} MATCHES "/MD")
-+        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-+      endif(${flag_var} MATCHES "/MD")
-+    endforeach(flag_var)
-+endif()
-+
- if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-     # If we're doing an out of source build and the user has a zconf.h
-     # in their source tree...