From 27f765b5f7339d65ae8409976a8147e378560d73 Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Tue, 23 Jan 2018 19:15:10 +0100 Subject: [PATCH] linux tcp is now opt-out instead of opt-in(to keep compatibility with the original lib). --- CMakeLists.txt | 22 ++++++++++++------- .../{tcpconnection => linux_tcp}/tcpchannel.h | 0 .../tcpconnection.h | 0 .../{tcpconnection => linux_tcp}/tcpdefines.h | 0 .../{tcpconnection => linux_tcp}/tcphandler.h | 0 .../CMakeLists.txt | 0 .../addressinfo.h | 0 src/{tcpconnection => linux_tcp}/includes.h | 0 src/{tcpconnection => linux_tcp}/pipe.h | 0 src/{tcpconnection => linux_tcp}/tcpclosed.h | 0 .../tcpconnected.h | 0 .../tcpconnection.cpp | 0 .../tcpinbuffer.h | 0 .../tcpoutbuffer.h | 0 .../tcpresolver.h | 0 src/{tcpconnection => linux_tcp}/tcpstate.h | 0 16 files changed, 14 insertions(+), 8 deletions(-) rename include/{tcpconnection => linux_tcp}/tcpchannel.h (100%) rename include/{tcpconnection => linux_tcp}/tcpconnection.h (100%) rename include/{tcpconnection => linux_tcp}/tcpdefines.h (100%) rename include/{tcpconnection => linux_tcp}/tcphandler.h (100%) rename src/{tcpconnection => linux_tcp}/CMakeLists.txt (100%) rename src/{tcpconnection => linux_tcp}/addressinfo.h (100%) rename src/{tcpconnection => linux_tcp}/includes.h (100%) rename src/{tcpconnection => linux_tcp}/pipe.h (100%) rename src/{tcpconnection => linux_tcp}/tcpclosed.h (100%) rename src/{tcpconnection => linux_tcp}/tcpconnected.h (100%) rename src/{tcpconnection => linux_tcp}/tcpconnection.cpp (100%) rename src/{tcpconnection => linux_tcp}/tcpinbuffer.h (100%) rename src/{tcpconnection => linux_tcp}/tcpoutbuffer.h (100%) rename src/{tcpconnection => linux_tcp}/tcpresolver.h (100%) rename src/{tcpconnection => linux_tcp}/tcpstate.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fc29d9..d99d9e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.1) # project name project(amqpcpp) +# build options +option(BUILD_PURE "build in pure mode" OFF) + # set output directory set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin) @@ -24,13 +27,20 @@ macro (add_sources) endif() endmacro() +# add source files add_subdirectory(src) -if(BUILD_TCP) - add_subdirectory(src/tcpconnection) +if(NOT NO_LINUX_TCP) + add_subdirectory(src/linux_tcp) endif() -option(BUILD_SHARED "build shared library" OFF) +# we have to prevent windows from defining the max macro. TODO more +if (WIN32) + add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) +endif() + +# TODO Cleanup into this part of the cmakefile +option(BUILD_SHARED "build shared library" OFF) if(BUILD_SHARED) add_library(${PROJECT_NAME} SHARED ${SRCS}) set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 2.7) # TODO version incorrect @@ -49,8 +59,4 @@ install(DIRECTORY include/ DESTINATION include/amqpcpp install(FILES amqpcpp.h DESTINATION include) set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) -set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE) - -if (WIN32) - add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) -endif() +set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE) \ No newline at end of file diff --git a/include/tcpconnection/tcpchannel.h b/include/linux_tcp/tcpchannel.h similarity index 100% rename from include/tcpconnection/tcpchannel.h rename to include/linux_tcp/tcpchannel.h diff --git a/include/tcpconnection/tcpconnection.h b/include/linux_tcp/tcpconnection.h similarity index 100% rename from include/tcpconnection/tcpconnection.h rename to include/linux_tcp/tcpconnection.h diff --git a/include/tcpconnection/tcpdefines.h b/include/linux_tcp/tcpdefines.h similarity index 100% rename from include/tcpconnection/tcpdefines.h rename to include/linux_tcp/tcpdefines.h diff --git a/include/tcpconnection/tcphandler.h b/include/linux_tcp/tcphandler.h similarity index 100% rename from include/tcpconnection/tcphandler.h rename to include/linux_tcp/tcphandler.h diff --git a/src/tcpconnection/CMakeLists.txt b/src/linux_tcp/CMakeLists.txt similarity index 100% rename from src/tcpconnection/CMakeLists.txt rename to src/linux_tcp/CMakeLists.txt diff --git a/src/tcpconnection/addressinfo.h b/src/linux_tcp/addressinfo.h similarity index 100% rename from src/tcpconnection/addressinfo.h rename to src/linux_tcp/addressinfo.h diff --git a/src/tcpconnection/includes.h b/src/linux_tcp/includes.h similarity index 100% rename from src/tcpconnection/includes.h rename to src/linux_tcp/includes.h diff --git a/src/tcpconnection/pipe.h b/src/linux_tcp/pipe.h similarity index 100% rename from src/tcpconnection/pipe.h rename to src/linux_tcp/pipe.h diff --git a/src/tcpconnection/tcpclosed.h b/src/linux_tcp/tcpclosed.h similarity index 100% rename from src/tcpconnection/tcpclosed.h rename to src/linux_tcp/tcpclosed.h diff --git a/src/tcpconnection/tcpconnected.h b/src/linux_tcp/tcpconnected.h similarity index 100% rename from src/tcpconnection/tcpconnected.h rename to src/linux_tcp/tcpconnected.h diff --git a/src/tcpconnection/tcpconnection.cpp b/src/linux_tcp/tcpconnection.cpp similarity index 100% rename from src/tcpconnection/tcpconnection.cpp rename to src/linux_tcp/tcpconnection.cpp diff --git a/src/tcpconnection/tcpinbuffer.h b/src/linux_tcp/tcpinbuffer.h similarity index 100% rename from src/tcpconnection/tcpinbuffer.h rename to src/linux_tcp/tcpinbuffer.h diff --git a/src/tcpconnection/tcpoutbuffer.h b/src/linux_tcp/tcpoutbuffer.h similarity index 100% rename from src/tcpconnection/tcpoutbuffer.h rename to src/linux_tcp/tcpoutbuffer.h diff --git a/src/tcpconnection/tcpresolver.h b/src/linux_tcp/tcpresolver.h similarity index 100% rename from src/tcpconnection/tcpresolver.h rename to src/linux_tcp/tcpresolver.h diff --git a/src/tcpconnection/tcpstate.h b/src/linux_tcp/tcpstate.h similarity index 100% rename from src/tcpconnection/tcpstate.h rename to src/linux_tcp/tcpstate.h