Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources

This commit is contained in:
ariel- committed 2018-03-28 04:41:59 -03:00
1 parent 7fff6c424f
commit 5ff847159c
1243 files changed
+29780 -36517

No files matched your search

+16 -6
View File
@@ -77,15 +77,12 @@ set (libzmq_STAT_SRCS
src/zap_client.cpp
)
add_definitions(-DZMQ_USE_SELECT)
add_definitions(-DZMQ_STATIC)
if (WIN32)
add_definitions(-DZMQ_HAVE_WINDOWS)
set(ZMQ_PLATFORM -DZMQ_HAVE_WINDOWS)
elseif (APPLE)
add_definitions(-DZMQ_HAVE_OSX)
set(ZMQ_PLATFORM -DZMQ_HAVE_OSX)
elseif (UNIX)
add_definitions(-DZMQ_HAVE_LINUX)
set(ZMQ_PLATFORM -DZMQ_HAVE_LINUX)
endif()
add_library(libzmq STATIC ${libzmq_STAT_SRCS})
@@ -95,8 +92,21 @@ target_include_directories(libzmq
${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(libzmq
PRIVATE
trinity-dependency-interface
PUBLIC
bzip2
zlib)
set_target_properties(libzmq
PROPERTIES
FOLDER
"dep")
target_compile_definitions(libzmq
PUBLIC
-DZMQ_USE_SELECT
-DZMQ_STATIC
${ZMQ_PLATFORM})
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef __PLATFORM_HPP_INCLUDED__
#define __PLATFORM_HPP_INCLUDED__
#define ZMQ_HAVE_WINDOWS
// #define ZMQ_HAVE_WINDOWS
// MSVC build configuration is controlled via options exposed in the Visual
// Studio user interface. The option to use libsodium is not exposed in the