You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bq...@apache.org on 2017/11/27 18:55:43 UTC
nifi-minifi-cpp git commit: MINIFICPP-324: Resolve build issues with
missing civet dependencies
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master d6c28e1ce -> 997b956d4
MINIFICPP-324: Resolve build issues with missing civet dependencies
This closes #207.
Signed-off-by: Bin Qiu <be...@gmail.com>
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/997b956d
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/997b956d
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/997b956d
Branch: refs/heads/master
Commit: 997b956d42b75ceaf4b627c68fef85a041c91769
Parents: d6c28e1
Author: Marc Parisi <ph...@apache.org>
Authored: Mon Nov 27 18:50:17 2017 +0000
Committer: Bin Qiu <be...@gmail.com>
Committed: Mon Nov 27 10:54:41 2017 -0800
----------------------------------------------------------------------
libminifi/CMakeLists.txt | 1 +
main/CMakeLists.txt | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/997b956d/libminifi/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt
index 2e49523..df775a7 100644
--- a/libminifi/CMakeLists.txt
+++ b/libminifi/CMakeLists.txt
@@ -86,6 +86,7 @@ else ()
endif (OPENSSL_FOUND)
add_library(minifi STATIC ${PROCESSOR_SOURCES})
+target_link_libraries(minifi c-library civetweb-cpp)
target_link_libraries(minifi core-minifi)
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/997b956d/main/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 633665c..5226979 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -54,8 +54,6 @@ include_directories(${OPENSSL_INCLUDE_DIR})
# Link against minifi, yaml-cpp, civetweb-cpp, uuid, openssl, jsoncpp and rocksdb
target_link_libraries(minifiexe core-minifi)
-target_link_libraries(minifiexe minifi yaml-cpp c-library civetweb-cpp ${JSON_CPP_LIB} ${UUID_LIBRARIES} ${OPENSSL_LIBRARIES})
-
if (APPLE)
target_link_libraries (minifiexe -Wl,-all_load minifi)
else ()
@@ -63,6 +61,9 @@ else ()
endif ()
+target_link_libraries(minifiexe yaml-cpp c-library civetweb-cpp ${JSON_CPP_LIB} ${UUID_LIBRARIES} ${OPENSSL_LIBRARIES})
+
+
if (APPLE)
get_property(extensions GLOBAL PROPERTY EXTENSION-OPTIONS)
foreach(EXTENSION ${extensions})