From 481c4268710fa92db21951a8393025e6e75c6b12 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Sat, 28 Oct 2017 02:28:40 -0400 Subject: [PATCH 1/2] remove unncessary Boost header dependency from core --- libminifi/include/core/ProcessSession.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libminifi/include/core/ProcessSession.h b/libminifi/include/core/ProcessSession.h index 27e2e7f41a..3961511292 100644 --- a/libminifi/include/core/ProcessSession.h +++ b/libminifi/include/core/ProcessSession.h @@ -19,7 +19,6 @@ #define __PROCESS_SESSION_H__ #include -#include #include #include #include From 67e70269ffceba00e447e910538bb1969b3c7a58 Mon Sep 17 00:00:00 2001 From: Dustin Rodrigues Date: Sun, 29 Oct 2017 21:44:49 -0400 Subject: [PATCH 2/2] MINIFICPP-272: fix Boost CMakeLists.txt ordering --- extensions/libarchive/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt index 260dc70cd8..4050b6103a 100644 --- a/extensions/libarchive/CMakeLists.txt +++ b/extensions/libarchive/CMakeLists.txt @@ -26,7 +26,6 @@ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-symbols") include_directories(../../libminifi/include ../../libminifi/include/core ../../thirdparty/spdlog-20170710/include ../../thirdparty/concurrentqueue ../../thirdparty/yaml-cpp-yaml-cpp-0.5.3/include ../../thirdparty/civetweb-1.9.1/include ../../thirdparty/jsoncpp/include ../../thirdparty/) include_directories(../../thirdparty/libarchive-3.3.2/libarchive) -include_directories(${Boost_INCLUDE_DIRS}) file(GLOB SOURCES "*.cpp") @@ -56,6 +55,7 @@ find_package(ZLIB REQUIRED) include_directories(${ZLIB_INCLUDE_DIRS}) target_link_libraries (minifi-archive-extensions ${ZLIB_LIBRARIES}) find_package(Boost COMPONENTS system filesystem REQUIRED) +include_directories(${Boost_INCLUDE_DIRS}) target_link_libraries(minifi-archive-extensions ${Boost_SYSTEM_LIBRARY}) target_link_libraries(minifi-archive-extensions ${Boost_FILESYSTEM_LIBRARY}) if (WIN32)