This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 6f2f0b5d3ad69b32572bf0a4fa082525e5bc7e3a Author: Adam Debreceni <[email protected]> AuthorDate: Tue Oct 26 11:56:27 2021 +0200 MINIFICPP-1670 - Move RESTReceiver to civet extension Signed-off-by: Adam Debreceni <[email protected]> This closes #1204 --- extensions/civetweb/CMakeLists.txt | 2 +- extensions/{http-curl => civetweb}/protocols/RESTReceiver.cpp | 0 extensions/{http-curl => civetweb}/protocols/RESTReceiver.h | 0 extensions/http-curl/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/civetweb/CMakeLists.txt b/extensions/civetweb/CMakeLists.txt index c5a2dca..873297b 100644 --- a/extensions/civetweb/CMakeLists.txt +++ b/extensions/civetweb/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories(${CMAKE_SOURCE_DIR}/libminifi/include ${CMAKE_SOURCE_DIR}/thirdparty/ ./include) -file(GLOB SOURCES "processors/*.cpp") +file(GLOB SOURCES "processors/*.cpp" "protocols/*.cpp") add_library(minifi-civet-extensions SHARED ${SOURCES}) target_link_libraries(minifi-civet-extensions ${LIBMINIFI} Threads::Threads) diff --git a/extensions/http-curl/protocols/RESTReceiver.cpp b/extensions/civetweb/protocols/RESTReceiver.cpp similarity index 100% rename from extensions/http-curl/protocols/RESTReceiver.cpp rename to extensions/civetweb/protocols/RESTReceiver.cpp diff --git a/extensions/http-curl/protocols/RESTReceiver.h b/extensions/civetweb/protocols/RESTReceiver.h similarity index 100% rename from extensions/http-curl/protocols/RESTReceiver.h rename to extensions/civetweb/protocols/RESTReceiver.h diff --git a/extensions/http-curl/CMakeLists.txt b/extensions/http-curl/CMakeLists.txt index ec1cf83..faae933 100644 --- a/extensions/http-curl/CMakeLists.txt +++ b/extensions/http-curl/CMakeLists.txt @@ -26,7 +26,6 @@ add_library(minifi-http-curl SHARED ${SOURCES}) target_link_libraries(minifi-http-curl ${LIBMINIFI} Threads::Threads) target_link_libraries(minifi-http-curl CURL::libcurl RapidJSON) -target_link_libraries(minifi-http-curl minifi-civet-extensions) SET (HTTP-CURL minifi-http-curl PARENT_SCOPE) register_extension(minifi-http-curl)
