nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phroc...@apache.org
Subject nifi-minifi-cpp git commit: MINIFICPP-272: fix Boost CMakeLists.txt ordering
Date Mon, 30 Oct 2017 11:50:31 GMT
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master 8abf967f4 -> e50120432


MINIFICPP-272: fix Boost CMakeLists.txt ordering

This closes #160.

Signed-off-by: Marc Parisi <phrocker@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/e5012043
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/e5012043
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/e5012043

Branch: refs/heads/master
Commit: e50120432bf1043c2f8d87b80717d02e03fd9d20
Parents: 8abf967
Author: Dustin Rodrigues <dust.rod@gmail.com>
Authored: Sun Oct 29 21:44:49 2017 -0400
Committer: Marc Parisi <phrocker@apache.org>
Committed: Mon Oct 30 07:50:20 2017 -0400

----------------------------------------------------------------------
 extensions/libarchive/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/e5012043/extensions/libarchive/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt
index 260dc70..4050b61 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)


Mime
View raw message