You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by fg...@apache.org on 2022/07/26 12:44:55 UTC
[nifi-minifi-cpp] 04/04: MINIFICPP-1884 Make whitespaces consistent across cmake files
This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit ce3374188345957fe370cb18b13cf7b4e99cb583
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Mon Jul 18 12:03:41 2022 +0200
MINIFICPP-1884 Make whitespaces consistent across cmake files
Make indentations a multiple of 4 in all cmake files
Signed-off-by: Ferenc Gerlits <fg...@gmail.com>
This closes #1372
---
CMakeLists.txt | 582 ++++++++++-----------
cmake/BuildDocs.cmake | 36 +-
cmake/BuildTests.cmake | 195 ++++---
cmake/BundledLibArchive.cmake | 2 +-
cmake/BundledRocksDB.cmake | 6 +-
cmake/Extensions.cmake | 122 ++---
cmake/FindBash.cmake | 60 +--
cmake/FindMaven.cmake | 10 +-
cmake/FindPCAP.cmake | 22 +-
cmake/FindPatch.cmake | 38 +-
cmake/FindTensorFlow.cmake | 10 +-
cmake/MiNiFiOptions.cmake | 4 +-
cmake/iOS.cmake | 254 ++++-----
cmake/opencv/FindOpenCV.cmake | 8 +-
cmake/rocksdb/sys/FindRocksDB.cmake | 22 +-
cmake/ssl/FindOpenSSL.cmake | 40 +-
cmake/winflexbison/FindBISON.cmake | 210 ++++----
cmake/winflexbison/FindFLEX.cmake | 142 ++---
cmake/zlib/dummy/FindZLIB.cmake | 34 +-
controller/CMakeLists.txt | 18 +-
encrypt-config/CMakeLists.txt | 8 +-
encrypt-config/tests/CMakeLists.txt | 20 +-
extensions/aws/CMakeLists.txt | 6 +-
extensions/azure/CMakeLists.txt | 4 +-
extensions/bustache/CMakeLists.txt | 2 +-
extensions/civetweb/CMakeLists.txt | 2 +-
extensions/coap/CMakeLists.txt | 2 +-
extensions/coap/tests/CMakeLists.txt | 54 +-
extensions/elasticsearch/CMakeLists.txt | 2 +-
extensions/expression-language/CMakeLists.txt | 102 ++--
.../expression-language/tests/CMakeLists.txt | 64 +--
extensions/gcp/CMakeLists.txt | 2 +-
extensions/gps/CMakeLists.txt | 2 +-
extensions/http-curl/CMakeLists.txt | 2 +-
extensions/http-curl/tests/CMakeLists.txt | 78 +--
extensions/jni/CMakeLists.txt | 76 +--
extensions/kubernetes/CMakeLists.txt | 2 +-
extensions/libarchive/CMakeLists.txt | 14 +-
extensions/librdkafka/CMakeLists.txt | 2 +-
extensions/librdkafka/tests/CMakeLists.txt | 20 +-
extensions/mqtt/CMakeLists.txt | 2 +-
extensions/opc/CMakeLists.txt | 2 +-
extensions/opencv/CMakeLists.txt | 2 +-
extensions/opencv/tests/CMakeLists.txt | 20 +-
extensions/openwsman/CMakeLists.txt | 2 +-
extensions/pcap/CMakeLists.txt | 26 +-
extensions/pdh/CMakeLists.txt | 2 +-
extensions/pdh/tests/CMakeLists.txt | 24 +-
extensions/procfs/CMakeLists.txt | 2 +-
extensions/prometheus/CMakeLists.txt | 2 +-
extensions/rocksdb-repos/CMakeLists.txt | 10 +-
extensions/script/CMakeLists.txt | 2 +-
extensions/script/tests/CMakeLists.txt | 110 ++--
extensions/sensors/CMakeLists.txt | 2 +-
extensions/sftp/CMakeLists.txt | 2 +-
extensions/sftp/tests/CMakeLists.txt | 64 +--
extensions/splunk/CMakeLists.txt | 2 +-
extensions/sql/CMakeLists.txt | 158 +++---
extensions/standard-processors/CMakeLists.txt | 1 -
.../standard-processors/tests/CMakeLists.txt | 84 +--
extensions/systemd/CMakeLists.txt | 2 +-
extensions/tensorflow/CMakeLists.txt | 2 +-
extensions/test-processors/CMakeLists.txt | 2 +-
extensions/windows-event-log/CMakeLists.txt | 2 +-
extensions/windows-event-log/tests/CMakeLists.txt | 34 +-
libminifi/CMakeLists.txt | 66 +--
libminifi/cmake/FindRocksDB.cmake | 10 +-
libminifi/cmake/iOS.cmake | 254 ++++-----
libminifi/test/archive-tests/CMakeLists.txt | 20 +-
libminifi/test/aws-tests/CMakeLists.txt | 28 +-
libminifi/test/azure-tests/CMakeLists.txt | 28 +-
libminifi/test/bustache-tests/CMakeLists.txt | 22 +-
libminifi/test/coap-tests/CMakeLists.txt | 16 +-
libminifi/test/gps-tests/CMakeLists.txt | 20 +-
libminifi/test/jni-tests/CMakeLists.txt | 22 +-
libminifi/test/mqtt-tests/CMakeLists.txt | 22 +-
libminifi/test/pcap-tests/CMakeLists.txt | 14 +-
libminifi/test/persistence-tests/CMakeLists.txt | 26 +-
libminifi/test/rocksdb-tests/CMakeLists.txt | 20 +-
libminifi/test/sensors-tests/CMakeLists.txt | 16 +-
libminifi/test/tensorflow-tests/CMakeLists.txt | 22 +-
libminifi/test/usb-camera-tests/CMakeLists.txt | 18 +-
main/CMakeLists.txt | 34 +-
nanofi/CMakeLists.txt | 10 +-
nanofi/ecu/CMakeLists.txt | 19 +-
python/library/CMakeLists.txt | 6 +-
86 files changed, 1765 insertions(+), 1768 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db06e7ba..abae13491 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,48 +48,48 @@ endif()
# Generate the build identifier if one is not provided
if (NOT BUILD_IDENTIFIER)
- string(RANDOM LENGTH 24 BUILD_IDENTIFIER)
- set(BUILD_IDENTIFIER "${BUILD_IDENTIFIER}" CACHE STRING "Build identifier" FORCE)
+ string(RANDOM LENGTH 24 BUILD_IDENTIFIER)
+ set(BUILD_IDENTIFIER "${BUILD_IDENTIFIER}" CACHE STRING "Build identifier" FORCE)
endif()
message("BUILD_IDENTIFIER is ${BUILD_IDENTIFIER}")
if (${FORCE_COLORED_OUTPUT})
- message("CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}")
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- add_compile_options (-fdiagnostics-color=always)
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- add_compile_options (-fcolor-diagnostics)
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
- add_compile_options (-fcolor-diagnostics)
- endif ()
-endif ()
+ message("CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}")
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ add_compile_options (-fdiagnostics-color=always)
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ add_compile_options (-fcolor-diagnostics)
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+ add_compile_options (-fcolor-diagnostics)
+ endif()
+endif()
if (USE_REAL_ODBC_TEST_DRIVER)
- add_definitions("-DUSE_REAL_ODBC_TEST_DRIVER")
+ add_definitions("-DUSE_REAL_ODBC_TEST_DRIVER")
endif()
# Use ccache if present
find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
- message("-- Found ccache: ${CCACHE_FOUND}")
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+ message("-- Found ccache: ${CCACHE_FOUND}")
endif(CCACHE_FOUND)
# Use gold linker if instructed
if (UNIX AND USE_GOLD_LINKER AND NOT APPLE )
- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version)
- if ("${ld_version}" MATCHES "GNU gold")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
- endif()
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version)
+ if ("${ld_version}" MATCHES "GNU gold")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
+ endif()
endif()
# Check for exec info before we enable the backtrace features.
CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO)
if (ENABLE_OPS AND HAS_EXECINFO AND NOT WIN32)
- add_definitions("-DHAS_EXECINFO=1")
+ add_definitions("-DHAS_EXECINFO=1")
endif()
#### Establish Project Configuration ####
@@ -100,17 +100,17 @@ if (WIN32)
endif()
if (WIN32)
- add_definitions(-DSERVICE_NAME="Apache NiFi MINiFi")
+ add_definitions(-DSERVICE_NAME="Apache NiFi MINiFi")
endif()
if (NOT PORTABLE)
- if(MSVC)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
- else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
- endif()
+ if(MSVC)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
+ else()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ endif()
endif()
include(CppVersion)
@@ -132,21 +132,21 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# Use ASAN if instructed
if (ASAN_BUILD)
- set(ASAN_FLAGS "-g -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ASAN_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ASAN_FLAGS}")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_FLAGS}")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_FLAGS}")
+ set(ASAN_FLAGS "-g -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ASAN_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ASAN_FLAGS}")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_FLAGS}")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_FLAGS}")
endif()
#### Third party dependencies ####
# Define function for passing dependencies
function(append_third_party_passthrough_args OUTPUT EXTERNALPROJECT_CMAKE_ARGS)
- string(REPLACE ";" "%" CMAKE_MODULE_PATH_PASSTHROUGH "${CMAKE_MODULE_PATH}")
- list(APPEND EXTERNALPROJECT_CMAKE_ARGS "-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH_PASSTHROUGH}")
- list(APPEND EXTERNALPROJECT_CMAKE_ARGS ${PASSTHROUGH_VARIABLES})
- set(${OUTPUT} ${EXTERNALPROJECT_CMAKE_ARGS} PARENT_SCOPE)
+ string(REPLACE ";" "%" CMAKE_MODULE_PATH_PASSTHROUGH "${CMAKE_MODULE_PATH}")
+ list(APPEND EXTERNALPROJECT_CMAKE_ARGS "-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH_PASSTHROUGH}")
+ list(APPEND EXTERNALPROJECT_CMAKE_ARGS ${PASSTHROUGH_VARIABLES})
+ set(${OUTPUT} ${EXTERNALPROJECT_CMAKE_ARGS} PARENT_SCOPE)
endfunction()
# Find bash executable
@@ -157,71 +157,71 @@ find_package(Patch REQUIRED)
# Setup passthrough args used by third parties
if (WIN32)
- set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
- set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
+ set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
+ set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
else()
- set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
- set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+ set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+ set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
endif()
set(PASSTHROUGH_CMAKE_ARGS -DANDROID_ABI=${ANDROID_ABI}
- -DANDROID_PLATFORM=${ANDROID_PLATFORM}
- -DANDROID_STL=${ANDROID_STL}
- -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DANDROID_NDK=${ANDROID_NDK}
- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
- -DCMAKE_C_FLAGS=${PASSTHROUGH_CMAKE_C_FLAGS}
- -DCMAKE_CXX_FLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
- -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
- -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
- -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=${CMAKE_FIND_ROOT_PATH_MODE_PROGRAM}
- -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY}
- -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- -DCOMPILE_DEFINITIONS=${COMPILE_DEFINITIONS}
- -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
- -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
- -G${CMAKE_GENERATOR}
- )
+ -DANDROID_PLATFORM=${ANDROID_PLATFORM}
+ -DANDROID_STL=${ANDROID_STL}
+ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DANDROID_NDK=${ANDROID_NDK}
+ -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+ -DCMAKE_C_FLAGS=${PASSTHROUGH_CMAKE_C_FLAGS}
+ -DCMAKE_CXX_FLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+ -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
+ -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
+ -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=${CMAKE_FIND_ROOT_PATH_MODE_PROGRAM}
+ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY}
+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+ -DCOMPILE_DEFINITIONS=${COMPILE_DEFINITIONS}
+ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+ -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
+ -G${CMAKE_GENERATOR}
+ )
# jemalloc
if(NOT WIN32)
- if (ENABLE_JNI)
- if (NOT DISABLE_JEMALLOC)
- include(BundledJemalloc)
- use_bundled_jemalloc(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
- message("jemalloc found at ${JEMALLOC_LIBRARIES}")
- endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_JNI")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_JNI")
- endif()
+ if (ENABLE_JNI)
+ if (NOT DISABLE_JEMALLOC)
+ include(BundledJemalloc)
+ use_bundled_jemalloc(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ message("jemalloc found at ${JEMALLOC_LIBRARIES}")
+ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_JNI")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_JNI")
+ endif()
endif()
# Simple-Windows-Posix-Semaphore
if (WIN32)
- add_subdirectory("thirdparty/Simple-Windows-Posix-Semaphore")
+ add_subdirectory("thirdparty/Simple-Windows-Posix-Semaphore")
endif()
# ossp-uuid
if(NOT WIN32)
- include(BundledOSSPUUID)
- use_bundled_osspuuid(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ include(BundledOSSPUUID)
+ use_bundled_osspuuid(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
endif()
# OpenSSL/LibreSSL
if (NOT OPENSSL_OFF)
- include(BundledLibreSSL)
- use_libre_ssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl")
+ include(BundledLibreSSL)
+ use_libre_ssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_SUPPORT")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_SUPPORT")
endif()
# libsodium
@@ -241,12 +241,12 @@ target_include_directories(ut SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/thir
# cURL
if(NOT DISABLE_CURL)
- include(BundledLibcURL)
- use_bundled_curl(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/curl/dummy")
+ include(BundledLibcURL)
+ use_bundled_curl(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/curl/dummy")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_CURL")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_CURL")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_CURL")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_CURL")
endif()
# spdlog
@@ -275,13 +275,13 @@ include(GslLite)
list(APPEND GslDefinitions gsl_CONFIG_DEFAULTS_VERSION=1)
list(APPEND GslDefinitionsNonStrict gsl_CONFIG_CONTRACT_VIOLATION_THROWS gsl_CONFIG_NARROW_THROWS_ON_TRUNCATION=1)
if (STRICT_GSL_CHECKS STREQUAL "AUDIT")
- list(APPEND GslDefinitions gsl_CONFIG_CONTRACT_CHECKING_AUDIT)
+ list(APPEND GslDefinitions gsl_CONFIG_CONTRACT_CHECKING_AUDIT)
endif()
if (NOT STRICT_GSL_CHECKS) # OFF (or any other falsey string) matches, AUDIT/ON/DEBUG_ONLY don't match
- list(APPEND GslDefinitions ${GslDefinitionsNonStrict})
+ list(APPEND GslDefinitions ${GslDefinitionsNonStrict})
endif()
if (STRICT_GSL_CHECKS STREQUAL "DEBUG_ONLY")
- list(APPEND GslDefinitions $<$<NOT:$<CONFIG:Debug>>:${GslDefinitionsNonStrict}>)
+ list(APPEND GslDefinitions $<$<NOT:$<CONFIG:Debug>>:${GslDefinitionsNonStrict}>)
endif()
target_compile_definitions(gsl-lite INTERFACE ${GslDefinitions})
@@ -293,23 +293,23 @@ include(ExpectedLite)
# Update passthrough args used in configurations in patch commands
if (WIN32)
- set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
- set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
+ set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
+ set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
else()
- set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
- set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+ set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+ set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
endif()
# Setup warning flags
if(MSVC)
- if(FAIL_ON_WARNINGS)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
- endif()
+ if(FAIL_ON_WARNINGS)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+ endif()
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
- if(FAIL_ON_WARNINGS)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
- endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+ if(FAIL_ON_WARNINGS)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ endif()
endif()
#### Extensions ####
@@ -319,215 +319,215 @@ include(Extensions)
add_subdirectory(libminifi)
if ((ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL) OR ENABLE_ALL OR ENABLE_AZURE)
- include(BundledLibXml2)
- use_bundled_libxml2(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/libxml2/dummy")
+ include(BundledLibXml2)
+ use_bundled_libxml2(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/libxml2/dummy")
endif()
if (ENABLE_ALL OR ENABLE_PROMETHEUS OR NOT DISABLE_CIVET)
- include(CivetWeb)
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/civetweb/dummy")
+ include(CivetWeb)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/civetweb/dummy")
endif()
## Add extensions
file(GLOB extension-directories "extensions/*")
foreach(extension-dir ${extension-directories})
- if (IS_DIRECTORY ${extension-dir} AND EXISTS ${extension-dir}/CMakeLists.txt)
- add_subdirectory(${extension-dir})
- endif()
+ if (IS_DIRECTORY ${extension-dir} AND EXISTS ${extension-dir}/CMakeLists.txt)
+ add_subdirectory(${extension-dir})
+ endif()
endforeach()
## NOW WE CAN ADD LIBRARIES AND EXTENSIONS TO MAIN
add_subdirectory(main)
if (ENABLE_NANOFI)
- add_subdirectory(nanofi)
+ add_subdirectory(nanofi)
endif()
if (ENABLE_ENCRYPT_CONFIG)
- add_subdirectory(encrypt-config)
+ add_subdirectory(encrypt-config)
endif()
if (NOT DISABLE_CURL AND NOT DISABLE_CONTROLLER)
- add_subdirectory(controller)
+ add_subdirectory(controller)
endif()
if (NOT DISABLE_CURL AND ENABLE_PYTHON AND NOT WIN32)
- if (ENABLE_NANOFI)
- add_subdirectory(python/library)
- else()
- message(FATAL_ERROR "Nanofi, a dependency of the python extension is disabled, therefore Python extension cannot be enabled.")
- endif()
+ if (ENABLE_NANOFI)
+ add_subdirectory(python/library)
+ else()
+ message(FATAL_ERROR "Nanofi, a dependency of the python extension is disabled, therefore Python extension cannot be enabled.")
+ endif()
endif()
get_property(selected_extensions GLOBAL PROPERTY EXTENSION-OPTIONS)
if (WIN32)
- # Get the latest abbreviated commit hash of the working branch
- execute_process(
- COMMAND git log -1 --format=%h
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE BUILD_REV
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND
- "${CMAKE_CURRENT_SOURCE_DIR}/generateVersion.bat"
- "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/libminifi
- "${CMAKE_CXX_COMPILER}"
- "${CMAKE_CXX_COMPILER_VERSION}"
- "${CMAKE_CXX_FLAGS}"
- \"${selected_extensions}\"
- "${BUILD_IDENTIFIER}"
- "${BUILD_REV}")
+ # Get the latest abbreviated commit hash of the working branch
+ execute_process(
+ COMMAND git log -1 --format=%h
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_VARIABLE BUILD_REV
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND
+ "${CMAKE_CURRENT_SOURCE_DIR}/generateVersion.bat"
+ "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/libminifi
+ "${CMAKE_CXX_COMPILER}"
+ "${CMAKE_CXX_COMPILER_VERSION}"
+ "${CMAKE_CXX_FLAGS}"
+ \"${selected_extensions}\"
+ "${BUILD_IDENTIFIER}"
+ "${BUILD_REV}")
else()
- execute_process(COMMAND
- "${CMAKE_CURRENT_SOURCE_DIR}/generateVersion.sh"
- "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/libminifi
- "${CMAKE_CXX_COMPILER}"
- "${CMAKE_CXX_COMPILER_VERSION}"
- "${CMAKE_CXX_FLAGS}"
- "${selected_extensions}"
- "${BUILD_IDENTIFIER}")
+ execute_process(COMMAND
+ "${CMAKE_CURRENT_SOURCE_DIR}/generateVersion.sh"
+ "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/libminifi
+ "${CMAKE_CXX_COMPILER}"
+ "${CMAKE_CXX_COMPILER_VERSION}"
+ "${CMAKE_CXX_FLAGS}"
+ "${selected_extensions}"
+ "${BUILD_IDENTIFIER}")
endif()
# Generate source assembly
set(ASSEMBLY_BASE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
if(WIN32)
- set(CPACK_ALL_INSTALL_TYPES Full Developer)
- set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Developer Full)
- set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
- set(CPACK_COMPONENT_APPLICATIONS_INSTALL_TYPES Full)
- set(CPACK_WIX_EXTENSIONS WixUtilExtension)
- set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/msi/minifi-logo-png-banner.png")
- set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/msi/bgr.png")
-
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/conf/")
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/NOTICE" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-
- # Determine the path of the VC Redistributable Merge Modules
- if (DEFINED ENV{VCToolsRedistDir})
- # Just get the redist dir that has been set by the build environment
- set(VCRUNTIME_REDIST_DIR $ENV{VCToolsRedistDir})
- else()
- # Try to fall back to a redist dir relative to the MSVC compiler
- string(REGEX REPLACE "/VC/Tools/MSVC/([0-9]+\\.[0-9]+).*" "/VC/Redist/MSVC/\\1" VCRUNTIME_REDIST_BASE_DIR ${CMAKE_C_COMPILER})
- file(GLOB VCRUNTIME_REDIST_VERSIONS "${VCRUNTIME_REDIST_BASE_DIR}*")
- if (NOT VCRUNTIME_REDIST_VERSIONS)
- message(FATAL_ERROR "Could not find the VC Redistributable Merge Modules. Please set VCRUNTIME_X86_MERGEMODULE_PATH and VCRUNTIME_X64_MERGEMODULE_PATH manually!")
- endif()
- # Sort the directories in descending order and take the first one - it should be the latest version
- list(SORT VCRUNTIME_REDIST_VERSIONS)
- list(REVERSE VCRUNTIME_REDIST_VERSIONS)
- list(GET VCRUNTIME_REDIST_VERSIONS 0 VCRUNTIME_REDIST_DIR)
- endif()
- message("Using redist directory: ${VCRUNTIME_REDIST_DIR}")
-
- if (MSI_REDISTRIBUTE_UCRT_NONASL)
- set(UCRT_DIR_NAT "$ENV{WindowsSdkDir}Redist\\ucrt\\DLLs\\$ENV{Platform}")
- file(TO_CMAKE_PATH "${UCRT_DIR_NAT}" UCRT_DIR)
- if (NOT EXISTS "${UCRT_DIR}")
- set(UCRT_DIR_NAT "$ENV{WindowsSdkDir}Redist\\$ENV{WindowsSDKVersion}ucrt\\DLLs\\$ENV{Platform}")
- file(TO_CMAKE_PATH "${UCRT_DIR_NAT}" UCRT_DIR)
- endif()
- if (NOT EXISTS "${UCRT_DIR}")
- message(FATAL_ERROR "Couldn't find UCRT")
- else()
- message("Using UCRT from ${UCRT_DIR}")
- file(GLOB UCRT_DLLS "${UCRT_DIR}/*.dll")
- file(COPY ${UCRT_DLLS} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/ucrt")
- install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ucrt/"
- DESTINATION bin
- COMPONENT bin
- )
- endif()
- endif()
-
- if (INSTALLER_MERGE_MODULES)
- message("Creating installer with merge modules")
- file(GLOB VCRUNTIME_X86_MERGEMODULES "${VCRUNTIME_REDIST_DIR}/MergeModules/Microsoft_VC*_CRT_x86.msm")
- file(GLOB VCRUNTIME_X64_MERGEMODULES "${VCRUNTIME_REDIST_DIR}/MergeModules/Microsoft_VC*_CRT_x64.msm")
- if (NOT VCRUNTIME_X86_MERGEMODULES OR NOT VCRUNTIME_X64_MERGEMODULES)
- message(FATAL_ERROR "Could not find the VC Redistributable Merge Modules. Please set VCRUNTIME_X86_MERGEMODULE_PATH and VCRUNTIME_X64_MERGEMODULE_PATH manually!")
- else()
- list(GET VCRUNTIME_X86_MERGEMODULES 0 VCRUNTIME_X86_MERGEMODULE_PATH)
- list(GET VCRUNTIME_X64_MERGEMODULES 0 VCRUNTIME_X64_MERGEMODULE_PATH)
- endif()
-
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- message("Using ${VCRUNTIME_X64_MERGEMODULE_PATH} VC Redistributable Merge Module")
- configure_file("msi/x64.wsi" "msi/x64.wsi" @ONLY)
- list(APPEND CPACK_WIX_EXTRA_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/msi/x64.wsi")
- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- message("Using ${VCRUNTIME_X86_MERGEMODULE_PATH} VC Redistributable Merge Module")
- configure_file("msi/x86.wsi" "msi/x86.wsi" @ONLY)
- list(APPEND CPACK_WIX_EXTRA_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/msi/x86.wsi")
- else()
- message(FATAL_ERROR "Could not determine architecture, CMAKE_SIZEOF_VOID_P is unexpected: ${CMAKE_SIZEOF_VOID_P}")
- endif()
- set(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/msi/WixWinMergeModules.wsi")
- else()
- message("Creating installer with redistributables")
- file(GLOB VC_RUNTIME_X86_REDIST_CRT_DIR_LIST LIST_DIRECTORIES true "${VCRUNTIME_REDIST_DIR}/x86/Microsoft.VC*.CRT")
- file(GLOB VC_RUNTIME_X64_REDIST_CRT_DIR_LIST LIST_DIRECTORIES true "${VCRUNTIME_REDIST_DIR}/x64/Microsoft.VC*.CRT")
- if (NOT VC_RUNTIME_X86_REDIST_CRT_DIR_LIST OR NOT VC_RUNTIME_X64_REDIST_CRT_DIR_LIST)
- message(FATAL_ERROR "Could not find the VC Redistributable. Please set VCRUNTIME_X86_REDIST_CRT_DIR and VCRUNTIME_X64_REDIST_CRT_DIR manually!")
- else()
- list(GET VCRUNTIME_X86_REDIST_CRT_DIR 0 VC_RUNTIME_X86_REDIST_CRT_DIR_LIST)
- list(GET VCRUNTIME_X64_REDIST_CRT_DIR 0 VC_RUNTIME_X64_REDIST_CRT_DIR_LIST)
- endif()
-
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- message("Using ${VCRUNTIME_X64_REDIST_CRT_DIR} VC Redistributables")
- file(GLOB VCRUNTIME_X64_REDIST_CRT_FILES "${VCRUNTIME_X64_REDIST_CRT_DIR}/*.dll")
- file(COPY ${VCRUNTIME_X64_REDIST_CRT_FILES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/redist")
- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- message("Using ${VCRUNTIME_X86_REDIST_CRT_DIR} VC Redistributables")
- file(GLOB VCRUNTIME_X86_REDIST_CRT_FILES "${VCRUNTIME_X86_REDIST_CRT_DIR}/*.dll")
- file(COPY ${VCRUNTIME_X86_REDIST_CRT_FILES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/redist")
- else()
- message(FATAL_ERROR "Could not determine architecture, CMAKE_SIZEOF_VOID_P is unexpected: ${CMAKE_SIZEOF_VOID_P}")
- endif()
- set(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/msi/WixWin.wsi")
- endif()
+ set(CPACK_ALL_INSTALL_TYPES Full Developer)
+ set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Developer Full)
+ set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
+ set(CPACK_COMPONENT_APPLICATIONS_INSTALL_TYPES Full)
+ set(CPACK_WIX_EXTENSIONS WixUtilExtension)
+ set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/msi/minifi-logo-png-banner.png")
+ set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/msi/bgr.png")
+
+ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/conf/")
+ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/NOTICE" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+
+ # Determine the path of the VC Redistributable Merge Modules
+ if (DEFINED ENV{VCToolsRedistDir})
+ # Just get the redist dir that has been set by the build environment
+ set(VCRUNTIME_REDIST_DIR $ENV{VCToolsRedistDir})
+ else()
+ # Try to fall back to a redist dir relative to the MSVC compiler
+ string(REGEX REPLACE "/VC/Tools/MSVC/([0-9]+\\.[0-9]+).*" "/VC/Redist/MSVC/\\1" VCRUNTIME_REDIST_BASE_DIR ${CMAKE_C_COMPILER})
+ file(GLOB VCRUNTIME_REDIST_VERSIONS "${VCRUNTIME_REDIST_BASE_DIR}*")
+ if (NOT VCRUNTIME_REDIST_VERSIONS)
+ message(FATAL_ERROR "Could not find the VC Redistributable Merge Modules. Please set VCRUNTIME_X86_MERGEMODULE_PATH and VCRUNTIME_X64_MERGEMODULE_PATH manually!")
+ endif()
+ # Sort the directories in descending order and take the first one - it should be the latest version
+ list(SORT VCRUNTIME_REDIST_VERSIONS)
+ list(REVERSE VCRUNTIME_REDIST_VERSIONS)
+ list(GET VCRUNTIME_REDIST_VERSIONS 0 VCRUNTIME_REDIST_DIR)
+ endif()
+ message("Using redist directory: ${VCRUNTIME_REDIST_DIR}")
+
+ if (MSI_REDISTRIBUTE_UCRT_NONASL)
+ set(UCRT_DIR_NAT "$ENV{WindowsSdkDir}Redist\\ucrt\\DLLs\\$ENV{Platform}")
+ file(TO_CMAKE_PATH "${UCRT_DIR_NAT}" UCRT_DIR)
+ if (NOT EXISTS "${UCRT_DIR}")
+ set(UCRT_DIR_NAT "$ENV{WindowsSdkDir}Redist\\$ENV{WindowsSDKVersion}ucrt\\DLLs\\$ENV{Platform}")
+ file(TO_CMAKE_PATH "${UCRT_DIR_NAT}" UCRT_DIR)
+ endif()
+ if (NOT EXISTS "${UCRT_DIR}")
+ message(FATAL_ERROR "Couldn't find UCRT")
+ else()
+ message("Using UCRT from ${UCRT_DIR}")
+ file(GLOB UCRT_DLLS "${UCRT_DIR}/*.dll")
+ file(COPY ${UCRT_DLLS} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/ucrt")
+ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ucrt/"
+ DESTINATION bin
+ COMPONENT bin
+ )
+ endif()
+ endif()
+
+ if (INSTALLER_MERGE_MODULES)
+ message("Creating installer with merge modules")
+ file(GLOB VCRUNTIME_X86_MERGEMODULES "${VCRUNTIME_REDIST_DIR}/MergeModules/Microsoft_VC*_CRT_x86.msm")
+ file(GLOB VCRUNTIME_X64_MERGEMODULES "${VCRUNTIME_REDIST_DIR}/MergeModules/Microsoft_VC*_CRT_x64.msm")
+ if (NOT VCRUNTIME_X86_MERGEMODULES OR NOT VCRUNTIME_X64_MERGEMODULES)
+ message(FATAL_ERROR "Could not find the VC Redistributable Merge Modules. Please set VCRUNTIME_X86_MERGEMODULE_PATH and VCRUNTIME_X64_MERGEMODULE_PATH manually!")
+ else()
+ list(GET VCRUNTIME_X86_MERGEMODULES 0 VCRUNTIME_X86_MERGEMODULE_PATH)
+ list(GET VCRUNTIME_X64_MERGEMODULES 0 VCRUNTIME_X64_MERGEMODULE_PATH)
+ endif()
+
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ message("Using ${VCRUNTIME_X64_MERGEMODULE_PATH} VC Redistributable Merge Module")
+ configure_file("msi/x64.wsi" "msi/x64.wsi" @ONLY)
+ list(APPEND CPACK_WIX_EXTRA_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/msi/x64.wsi")
+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ message("Using ${VCRUNTIME_X86_MERGEMODULE_PATH} VC Redistributable Merge Module")
+ configure_file("msi/x86.wsi" "msi/x86.wsi" @ONLY)
+ list(APPEND CPACK_WIX_EXTRA_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/msi/x86.wsi")
+ else()
+ message(FATAL_ERROR "Could not determine architecture, CMAKE_SIZEOF_VOID_P is unexpected: ${CMAKE_SIZEOF_VOID_P}")
+ endif()
+ set(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/msi/WixWinMergeModules.wsi")
+ else()
+ message("Creating installer with redistributables")
+ file(GLOB VC_RUNTIME_X86_REDIST_CRT_DIR_LIST LIST_DIRECTORIES true "${VCRUNTIME_REDIST_DIR}/x86/Microsoft.VC*.CRT")
+ file(GLOB VC_RUNTIME_X64_REDIST_CRT_DIR_LIST LIST_DIRECTORIES true "${VCRUNTIME_REDIST_DIR}/x64/Microsoft.VC*.CRT")
+ if (NOT VC_RUNTIME_X86_REDIST_CRT_DIR_LIST OR NOT VC_RUNTIME_X64_REDIST_CRT_DIR_LIST)
+ message(FATAL_ERROR "Could not find the VC Redistributable. Please set VCRUNTIME_X86_REDIST_CRT_DIR and VCRUNTIME_X64_REDIST_CRT_DIR manually!")
+ else()
+ list(GET VCRUNTIME_X86_REDIST_CRT_DIR 0 VC_RUNTIME_X86_REDIST_CRT_DIR_LIST)
+ list(GET VCRUNTIME_X64_REDIST_CRT_DIR 0 VC_RUNTIME_X64_REDIST_CRT_DIR_LIST)
+ endif()
+
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ message("Using ${VCRUNTIME_X64_REDIST_CRT_DIR} VC Redistributables")
+ file(GLOB VCRUNTIME_X64_REDIST_CRT_FILES "${VCRUNTIME_X64_REDIST_CRT_DIR}/*.dll")
+ file(COPY ${VCRUNTIME_X64_REDIST_CRT_FILES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/redist")
+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ message("Using ${VCRUNTIME_X86_REDIST_CRT_DIR} VC Redistributables")
+ file(GLOB VCRUNTIME_X86_REDIST_CRT_FILES "${VCRUNTIME_X86_REDIST_CRT_DIR}/*.dll")
+ file(COPY ${VCRUNTIME_X86_REDIST_CRT_FILES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/redist")
+ else()
+ message(FATAL_ERROR "Could not determine architecture, CMAKE_SIZEOF_VOID_P is unexpected: ${CMAKE_SIZEOF_VOID_P}")
+ endif()
+ set(CPACK_WIX_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/msi/WixWin.wsi")
+ endif()
else()
- set(CPACK_SOURCE_GENERATOR "TGZ")
+ set(CPACK_SOURCE_GENERATOR "TGZ")
endif(WIN32)
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${ASSEMBLY_BASE_NAME}-source")
set(CPACK_SOURCE_IGNORE_FILES "/docs/generated/;${CMAKE_SOURCE_DIR}/build/;~$;${CPACK_SOURCE_IGNORE_FILES};${CMAKE_SOURCE_DIR}/.git/;${CMAKE_SOURCE_DIR}/.idea/;${CMAKE_SOURCE_DIR}/cmake-build-debug/;${CMAKE_SOURCE_DIR}/extensions/expression-language/Scanner.h;${CMAKE_SOURCE_DIR}/extensions/expression-language/Scanner.cpp;${CMAKE_SOURCE_DIR}/extensions/expression-language/Parser.cpp;${CMAKE_SOURCE_DIR}/extensions/expression-language/Parser.hpp;${CMAKE_SOURCE_DIR}/extensions/expression-lan [...]
# Generate binary assembly. Exclude conf for windows since we'll be doing the work in the WiX template
if (NOT WIN32)
- install(FILES conf/minifi.properties conf/minifi-log.properties conf/minifi-uid.properties conf/config.yml
- DESTINATION conf
- COMPONENT bin)
+ install(FILES conf/minifi.properties conf/minifi-log.properties conf/minifi-uid.properties conf/config.yml
+ DESTINATION conf
+ COMPONENT bin)
- install(DIRECTORY extensions/pythonprocessors/
- DESTINATION minifi-python
- COMPONENT bin)
+ install(DIRECTORY extensions/pythonprocessors/
+ DESTINATION minifi-python
+ COMPONENT bin)
- install(PROGRAMS bin/minifi.sh
- DESTINATION bin
- COMPONENT bin)
+ install(PROGRAMS bin/minifi.sh
+ DESTINATION bin
+ COMPONENT bin)
endif()
install(FILES LICENSE README.md NOTICE
- DESTINATION .
- COMPONENT bin)
+ DESTINATION .
+ COMPONENT bin)
include(CPackComponent)
if (WIN32)
- set(CPACK_GENERATOR "WIX")
- set(CPACK_WIX_UPGRADE_GUID "FE29F801-3486-4E9E-AFF9-838C1A5C8D59")
- set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/msi/minifi-logo-ico.ico")
+ set(CPACK_GENERATOR "WIX")
+ set(CPACK_WIX_UPGRADE_GUID "FE29F801-3486-4E9E-AFF9-838C1A5C8D59")
+ set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/msi/minifi-logo-ico.ico")
else()
- set(CPACK_GENERATOR "TGZ")
+ set(CPACK_GENERATOR "TGZ")
endif()
set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 1)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache NiFi MiNiFi C++ version ${VERSION}")
@@ -540,11 +540,11 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY)
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
if(NOT WIN32)
- set(CPACK_PACKAGE_FILE_NAME "${ASSEMBLY_BASE_NAME}")
- set(CPACK_GENERATOR "TGZ")
- set(CPACK_BINARY_TGZ, "ON")
+ set(CPACK_PACKAGE_FILE_NAME "${ASSEMBLY_BASE_NAME}")
+ set(CPACK_GENERATOR "TGZ")
+ set(CPACK_BINARY_TGZ, "ON")
else()
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}")
+ set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}")
endif()
set(CPACK_PACKAGE_INSTALL_DIRECTORY "ApacheNiFiMiNiFi")
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
@@ -558,22 +558,22 @@ set(CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
list(APPEND CPACK_COMPONENTS_ALL bin)
cpack_add_component(bin DISPLAY_NAME "MiNiFi C++ executables" REQUIRED)
if(NOT WIN32)
- list(APPEND CPACK_COMPONENTS_ALL conf)
- cpack_add_component(conf DISPLAY_NAME "Default configuration files" REQUIRED)
+ list(APPEND CPACK_COMPONENTS_ALL conf)
+ cpack_add_component(conf DISPLAY_NAME "Default configuration files" REQUIRED)
endif()
cpack_add_component_group(extensions DISPLAY_NAME "Extensions" EXPANDED)
foreach(extension ${selected_extensions})
- get_component_name(${extension} component-name)
- list(APPEND CPACK_COMPONENTS_ALL ${component-name})
- cpack_add_component(${component-name} DISPLAY_NAME ${extension} GROUP extensions DEPENDS bin)
+ get_component_name(${extension} component-name)
+ list(APPEND CPACK_COMPONENTS_ALL ${component-name})
+ cpack_add_component(${component-name} DISPLAY_NAME ${extension} GROUP extensions DEPENDS bin)
endforeach()
include(CPack)
### include modules
if (NOT SKIP_TESTS)
- include(BuildTests)
+ include(BuildTests)
endif()
## Add KeyValueStorageService tests
@@ -582,7 +582,7 @@ registerTest("${TEST_DIR}/keyvalue-tests")
registerTest("${TEST_DIR}/flow-tests")
if (NOT DISABLE_ROCKSDB AND NOT DISABLE_LIBARCHIVE)
- registerTest("${TEST_DIR}/persistence-tests")
+ registerTest("${TEST_DIR}/persistence-tests")
endif()
registerTest("encrypt-config/tests")
@@ -593,40 +593,40 @@ include(BuildDocs)
# Create a custom build target that will run the linter.
# Directories have their separate linter targets to be able to use better parallelization
if (ENABLE_LINTER)
- get_property(extensions GLOBAL PROPERTY EXTENSION-LINTERS)
- set(root_linted_dirs libminifi/include libminifi/src libminifi/test encrypt-config)
- list(TRANSFORM root_linted_dirs PREPEND ${CMAKE_SOURCE_DIR}/)
+ get_property(extensions GLOBAL PROPERTY EXTENSION-LINTERS)
+ set(root_linted_dirs libminifi/include libminifi/src libminifi/test encrypt-config)
+ list(TRANSFORM root_linted_dirs PREPEND ${CMAKE_SOURCE_DIR}/)
- set(linted_dir_counter 1)
- set(root_linter_target_names "")
+ set(linted_dir_counter 1)
+ set(root_linter_target_names "")
- foreach(linted_dir ${root_linted_dirs})
- set(linter_target_name "root-linter-${linted_dir_counter}")
- list(APPEND root_linter_target_names ${linter_target_name})
- add_custom_target("${linter_target_name}"
- COMMAND python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${linted_dir}
- )
- math(EXPR linted_dir_counter "${linted_dir_counter}+1")
- endforeach()
+ foreach(linted_dir ${root_linted_dirs})
+ set(linter_target_name "root-linter-${linted_dir_counter}")
+ list(APPEND root_linter_target_names ${linter_target_name})
+ add_custom_target("${linter_target_name}"
+ COMMAND python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${linted_dir}
+ )
+ math(EXPR linted_dir_counter "${linted_dir_counter}+1")
+ endforeach()
- # Main linter target that depends on every other
- add_custom_target(linter)
- add_dependencies(linter ${root_linter_target_names} ${extensions})
+ # Main linter target that depends on every other
+ add_custom_target(linter)
+ add_dependencies(linter ${root_linter_target_names} ${extensions})
endif()
if(NOT WIN32)
add_custom_target(shellcheck
- COMMAND ${CMAKE_SOURCE_DIR}/run_shellcheck.sh ${CMAKE_SOURCE_DIR})
+ COMMAND ${CMAKE_SOURCE_DIR}/run_shellcheck.sh ${CMAKE_SOURCE_DIR})
add_custom_target(flake8
- COMMAND ${CMAKE_SOURCE_DIR}/run_flake8.sh ${CMAKE_SOURCE_DIR})
+ COMMAND ${CMAKE_SOURCE_DIR}/run_flake8.sh ${CMAKE_SOURCE_DIR})
endif(NOT WIN32)
# Custom target to download and run Apache Release Audit Tool (RAT)
add_custom_target(
- apache-rat
- ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/RunApacheRAT.cmake
- COMMAND java -jar ${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/apache-rat-0.13/apache-rat-0.13.jar -E ${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/.rat-excludes -d ${CMAKE_SOURCE_DIR} | grep -B 1 -A 15 Summary )
+ apache-rat
+ ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/RunApacheRAT.cmake
+ COMMAND java -jar ${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/apache-rat-0.13/apache-rat-0.13.jar -E ${CMAKE_SOURCE_DIR}/thirdparty/apache-rat/.rat-excludes -d ${CMAKE_SOURCE_DIR} | grep -B 1 -A 15 Summary )
feature_summary(WHAT ALL FILENAME ${CMAKE_BINARY_DIR}/all.log)
diff --git a/cmake/BuildDocs.cmake b/cmake/BuildDocs.cmake
index bb7560431..0b9d5529e 100644
--- a/cmake/BuildDocs.cmake
+++ b/cmake/BuildDocs.cmake
@@ -18,25 +18,25 @@
FIND_PACKAGE(Doxygen)
if(DOXYGEN_FOUND)
-if(EXISTS ${DOXYGEN_EXECUTABLE})
+ if(EXISTS ${DOXYGEN_EXECUTABLE})
-MESSAGE("-- Creating API Documentation using ${DOXYGEN_EXECUTABLE}")
-SET(DOXYGEN_INPUT "../docs/Doxyfile")
-SET(DOXYGEN_OUTPUT "../docs")
+ MESSAGE("-- Creating API Documentation using ${DOXYGEN_EXECUTABLE}")
+ SET(DOXYGEN_INPUT "../docs/Doxyfile")
+ SET(DOXYGEN_OUTPUT "../docs")
-ADD_CUSTOM_COMMAND(
- OUTPUT ${DOXYGEN_OUTPUT}
- COMMAND ${CMAKE_COMMAND} -E echo_append "Building LibMiNiFi API Documentation..."
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
- COMMAND ${CMAKE_COMMAND} -E echo "Done."
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${DOXYGEN_INPUT}
- )
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${DOXYGEN_OUTPUT}
+ COMMAND ${CMAKE_COMMAND} -E echo_append "Building LibMiNiFi API Documentation..."
+ COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
+ COMMAND ${CMAKE_COMMAND} -E echo "Done."
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS ${DOXYGEN_INPUT}
+ )
-ADD_CUSTOM_TARGET(docs ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT})
+ ADD_CUSTOM_TARGET(docs ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT})
+ else()
+ ADD_CUSTOM_TARGET(docs echo "Doxygen binary does not exist. Cannot create documentation... Please install Doxygen or verify correct installation.")
+ endif()
else()
-ADD_CUSTOM_TARGET(docs echo "Doxygen binary does not exist. Cannot create documentation... Please install Doxygen or verify correct installation.")
-endif()
-else()
-ADD_CUSTOM_TARGET(docs echo "Doxygen does not exist. Please install it. Cannot create documentation...")
-endif(DOXYGEN_FOUND)
\ No newline at end of file
+ ADD_CUSTOM_TARGET(docs echo "Doxygen does not exist. Please install it. Cannot create documentation...")
+endif(DOXYGEN_FOUND)
diff --git a/cmake/BuildTests.cmake b/cmake/BuildTests.cmake
index d5014b679..a0346f41c 100644
--- a/cmake/BuildTests.cmake
+++ b/cmake/BuildTests.cmake
@@ -18,67 +18,66 @@
### test functions
MACRO(GETSOURCEFILES result curdir)
- FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
- SET(dirlist "")
- FOREACH(child ${children})
- IF( "${child}" MATCHES ^[^.].*\\.cpp)
-
- LIST(APPEND dirlist ${child})
- ENDIF()
- ENDFOREACH()
- SET(${result} ${dirlist})
+ FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
+ SET(dirlist "")
+ FOREACH(child ${children})
+ IF( "${child}" MATCHES ^[^.].*\\.cpp)
+ LIST(APPEND dirlist ${child})
+ ENDIF()
+ ENDFOREACH()
+ SET(${result} ${dirlist})
ENDMACRO()
set(NANOFI_TEST_DIR "${CMAKE_SOURCE_DIR}/nanofi/tests/")
if(NOT EXCLUDE_BOOST)
- find_package(Boost COMPONENTS system filesystem)
- if(Boost_FOUND)
- add_definitions(-DUSE_BOOST)
- endif()
+ find_package(Boost COMPONENTS system filesystem)
+ if(Boost_FOUND)
+ add_definitions(-DUSE_BOOST)
+ endif()
endif()
function(appendIncludes testName)
- target_include_directories(${testName} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/include")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/c2/protocols")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/c2")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/controller")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/repository")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/yaml")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/statemanagement")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/statemanagement/metrics")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/io")
- if(WIN32)
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win/io")
- else()
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/posix")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/posix/io")
- endif()
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/utils")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/processors")
- target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/provenance")
+ target_include_directories(${testName} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/include")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/c2/protocols")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/c2")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/controller")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/repository")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/yaml")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/statemanagement")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/core/statemanagement/metrics")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/io")
+ if(WIN32)
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win/io")
+ else()
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/posix")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/posix/io")
+ endif()
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/utils")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/processors")
+ target_include_directories(${testName} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/provenance")
endfunction()
function(createTests testName)
- message(DEBUG "-- Adding test: ${testName}")
- appendIncludes("${testName}")
-
- if (Boost_FOUND)
- target_include_directories(${testName} BEFORE PRIVATE "${Boost_INCLUDE_DIRS}")
- endif()
- target_link_libraries(${testName} ${CMAKE_DL_LIBS})
- target_wholearchive_library(${testName} ${TEST_BASE_LIB})
- target_link_libraries(${testName} core-minifi yaml-cpp spdlog Threads::Threads)
- if (Boost_FOUND)
- target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY})
- target_link_libraries(${testName} ${Boost_FILESYSTEM_LIBRARY})
- endif()
- target_compile_definitions(${testName} PRIVATE LOAD_EXTENSIONS)
- set_target_properties(${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ message(DEBUG "-- Adding test: ${testName}")
+ appendIncludes("${testName}")
+
+ if (Boost_FOUND)
+ target_include_directories(${testName} BEFORE PRIVATE "${Boost_INCLUDE_DIRS}")
+ endif()
+ target_link_libraries(${testName} ${CMAKE_DL_LIBS})
+ target_wholearchive_library(${testName} ${TEST_BASE_LIB})
+ target_link_libraries(${testName} core-minifi yaml-cpp spdlog Threads::Threads)
+ if (Boost_FOUND)
+ target_link_libraries(${testName} ${Boost_SYSTEM_LIBRARY})
+ target_link_libraries(${testName} ${Boost_FILESYSTEM_LIBRARY})
+ endif()
+ target_compile_definitions(${testName} PRIVATE LOAD_EXTENSIONS)
+ set_target_properties(${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
endfunction()
enable_testing(test)
@@ -91,9 +90,9 @@ target_link_libraries(${TEST_BASE_LIB} core-minifi)
target_include_directories(${TEST_BASE_LIB} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
target_include_directories(${TEST_BASE_LIB} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/")
if(WIN32)
- target_include_directories(${TEST_BASE_LIB} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win")
+ target_include_directories(${TEST_BASE_LIB} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win")
else()
- target_include_directories(${TEST_BASE_LIB} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/posix")
+ target_include_directories(${TEST_BASE_LIB} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/posix")
endif()
SET(CATCH_MAIN_LIB catch_main)
@@ -109,62 +108,62 @@ GETSOURCEFILES(INTEGRATION_TESTS "${TEST_DIR}/integration/")
SET(UNIT_TEST_COUNT 0)
FOREACH(testfile ${UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${TEST_DIR}/unit/${testfile}")
- target_compile_definitions("${testfilename}" PRIVATE TZ_DATA_DIR="${CMAKE_BINARY_DIR}/tzdata")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${TEST_DIR}/unit/${testfile}")
+ target_compile_definitions("${testfilename}" PRIVATE TZ_DATA_DIR="${CMAKE_BINARY_DIR}/tzdata")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${UNIT_TEST_COUNT} unit test file(s)...")
if (NOT OPENSSL_OFF)
- SET(UNIT_TEST_COUNT 0)
- FOREACH(testfile ${TLS_UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${TEST_DIR}/unit/tls/${testfile}")
- createTests("${testfilename}")
- MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" "${TEST_RESOURCES}/" WORKING_DIRECTORY ${TEST_DIR})
- ENDFOREACH()
- message("-- Finished building ${UNIT_TEST_COUNT} TLS unit test file(s)...")
+ SET(UNIT_TEST_COUNT 0)
+ FOREACH(testfile ${TLS_UNIT_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${TEST_DIR}/unit/tls/${testfile}")
+ createTests("${testfilename}")
+ MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" "${TEST_RESOURCES}/" WORKING_DIRECTORY ${TEST_DIR})
+ ENDFOREACH()
+ message("-- Finished building ${UNIT_TEST_COUNT} TLS unit test file(s)...")
endif()
if(NOT WIN32 AND ENABLE_NANOFI)
- SET(UNIT_TEST_COUNT 0)
- FOREACH(testfile ${NANOFI_UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${NANOFI_TEST_DIR}/${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
- appendIncludes("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} Threads::Threads)
-
- target_wholearchive_library(${testfilename} nanofi)
-
- createTests(${testfilename})
-
- target_link_libraries(${testfilename} minifi-standard-processors)
-
- MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
- if (Boost_FOUND)
- target_link_libraries(${testfilename} ${Boost_SYSTEM_LIBRARY})
- target_link_libraries(${testfilename} ${Boost_FILESYSTEM_LIBRARY})
- endif()
- ENDFOREACH()
- message("-- Finished building ${UNIT_TEST_COUNT} NanoFi unit test file(s)...")
+ SET(UNIT_TEST_COUNT 0)
+ FOREACH(testfile ${NANOFI_UNIT_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${NANOFI_TEST_DIR}/${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
+ appendIncludes("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} Threads::Threads)
+
+ target_wholearchive_library(${testfilename} nanofi)
+
+ createTests(${testfilename})
+
+ target_link_libraries(${testfilename} minifi-standard-processors)
+
+ MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ if (Boost_FOUND)
+ target_link_libraries(${testfilename} ${Boost_SYSTEM_LIBRARY})
+ target_link_libraries(${testfilename} ${Boost_FILESYSTEM_LIBRARY})
+ endif()
+ ENDFOREACH()
+ message("-- Finished building ${UNIT_TEST_COUNT} NanoFi unit test file(s)...")
endif()
SET(INT_TEST_COUNT 0)
FOREACH(testfile ${INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${TEST_DIR}/integration/${testfile}")
- createTests("${testfilename}")
- MATH(EXPR INT_TEST_COUNT "${INT_TEST_COUNT}+1")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${TEST_DIR}/integration/${testfile}")
+ createTests("${testfilename}")
+ MATH(EXPR INT_TEST_COUNT "${INT_TEST_COUNT}+1")
ENDFOREACH()
target_link_libraries(OnScheduleErrorHandlingTests minifi-test-processors)
@@ -177,5 +176,5 @@ message("-- Finished building ${INT_TEST_COUNT} integration test file(s)...")
get_property(extensions GLOBAL PROPERTY EXTENSION-TESTS)
foreach(EXTENSION ${extensions})
- add_subdirectory(${EXTENSION})
+ add_subdirectory(${EXTENSION})
endforeach()
diff --git a/cmake/BundledLibArchive.cmake b/cmake/BundledLibArchive.cmake
index d386a77d4..14bd48f60 100644
--- a/cmake/BundledLibArchive.cmake
+++ b/cmake/BundledLibArchive.cmake
@@ -116,5 +116,5 @@ function(use_bundled_libarchive SOURCE_DIR BINARY_DIR)
endif()
file(MAKE_DIRECTORY ${LIBARCHIVE_INCLUDE_DIRS})
set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LIBARCHIVE_INCLUDE_DIRS})
- set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "LIBARCHIVE_STATIC=1")
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "LIBARCHIVE_STATIC=1")
endfunction(use_bundled_libarchive)
diff --git a/cmake/BundledRocksDB.cmake b/cmake/BundledRocksDB.cmake
index 76ce50a25..b7dfcc1e9 100644
--- a/cmake/BundledRocksDB.cmake
+++ b/cmake/BundledRocksDB.cmake
@@ -42,9 +42,9 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
if(PORTABLE)
list(APPEND ROCKSDB_CMAKE_ARGS -DPORTABLE=ON)
endif()
- if(WIN32)
- list(APPEND ROCKSDB_CMAKE_ARGS -DROCKSDB_INSTALL_ON_WINDOWS=ON)
- endif()
+ if(WIN32)
+ list(APPEND ROCKSDB_CMAKE_ARGS -DROCKSDB_INSTALL_ON_WINDOWS=ON)
+ endif()
# Build project
ExternalProject_Add(
diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake
index 295538402..5df9e53fb 100644
--- a/cmake/Extensions.cmake
+++ b/cmake/Extensions.cmake
@@ -17,8 +17,8 @@
define_property(GLOBAL PROPERTY EXTENSION-OPTIONS
- BRIEF_DOCS "Global extension list"
- FULL_DOCS "Global extension list")
+ BRIEF_DOCS "Global extension list"
+ FULL_DOCS "Global extension list")
set_property(GLOBAL PROPERTY EXTENSION-OPTIONS "")
@@ -33,86 +33,86 @@ file(GENERATE OUTPUT ${extension-build-info-file}
#endif\n")
function(get_build_id_variable_name extension-name output)
- string(REPLACE "-" "_" result ${extension-name})
- string(APPEND result "_build_identifier")
- set("${output}" "${result}" PARENT_SCOPE)
+ string(REPLACE "-" "_" result ${extension-name})
+ string(APPEND result "_build_identifier")
+ set("${output}" "${result}" PARENT_SCOPE)
endfunction()
macro(register_extension extension-name extension-display-name extension-guard description)
- set(${extension-guard} ${extension-name} PARENT_SCOPE)
- get_property(extensions GLOBAL PROPERTY EXTENSION-OPTIONS)
- set_property(GLOBAL APPEND PROPERTY EXTENSION-OPTIONS ${extension-name})
- get_build_id_variable_name(${extension-name} build-id-variable-name)
- set_source_files_properties(${extension-build-info-file} PROPERTIES GENERATED TRUE)
- target_sources(${extension-name} PRIVATE ${extension-build-info-file})
- target_compile_definitions(${extension-name}
- PRIVATE "MODULE_NAME=${extension-name}"
- PRIVATE "BUILD_ID_VARIABLE_NAME=${build-id-variable-name}")
- set_target_properties(${extension-name} PROPERTIES
- ENABLE_EXPORTS True
- POSITION_INDEPENDENT_CODE ON)
- if (WIN32)
+ set(${extension-guard} ${extension-name} PARENT_SCOPE)
+ get_property(extensions GLOBAL PROPERTY EXTENSION-OPTIONS)
+ set_property(GLOBAL APPEND PROPERTY EXTENSION-OPTIONS ${extension-name})
+ get_build_id_variable_name(${extension-name} build-id-variable-name)
+ set_source_files_properties(${extension-build-info-file} PROPERTIES GENERATED TRUE)
+ target_sources(${extension-name} PRIVATE ${extension-build-info-file})
+ target_compile_definitions(${extension-name}
+ PRIVATE "MODULE_NAME=${extension-name}"
+ PRIVATE "BUILD_ID_VARIABLE_NAME=${build-id-variable-name}")
set_target_properties(${extension-name} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
- else()
- set_target_properties(${extension-name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
- endif()
-
- get_component_name(${extension-name} component-name)
-
- if (WIN32)
- install(TARGETS ${extension-name} RUNTIME DESTINATION extensions COMPONENT ${component-name})
- else()
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- target_link_options(${extension-name} PRIVATE "-Wl,--disable-new-dtags")
+ ENABLE_EXPORTS True
+ POSITION_INDEPENDENT_CODE ON)
+ if(WIN32)
+ set_target_properties(${extension-name} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+ else()
+ set_target_properties(${extension-name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ endif()
+
+ get_component_name(${extension-name} component-name)
+
+ if(WIN32)
+ install(TARGETS ${extension-name} RUNTIME DESTINATION extensions COMPONENT ${component-name})
+ else()
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ target_link_options(${extension-name} PRIVATE "-Wl,--disable-new-dtags")
+ endif()
+ set_target_properties(${extension-name} PROPERTIES INSTALL_RPATH "$ORIGIN")
+ install(TARGETS ${extension-name} LIBRARY DESTINATION extensions COMPONENT ${component-name})
+ endif()
+
+ ADD_FEATURE_INFO("${extension-display-name}" ${extension-guard} "${description}")
+ mark_as_advanced(${extension-guard})
+ # check for test directory
+ if(${ARGC} GREATER 4)
+ register_extension_test(${ARGV4})
endif()
- set_target_properties(${extension-name} PROPERTIES INSTALL_RPATH "$ORIGIN")
- install(TARGETS ${extension-name} LIBRARY DESTINATION extensions COMPONENT ${component-name})
- endif()
-
- ADD_FEATURE_INFO("${extension-display-name}" ${extension-guard} "${description}")
- mark_as_advanced(${extension-guard})
- # check for test directory
- if (${ARGC} GREATER 4)
- register_extension_test(${ARGV4})
- endif()
endmacro()
### TESTING MACROS
define_property(GLOBAL PROPERTY EXTENSION-TESTS
- BRIEF_DOCS "Global extension tests"
- FULL_DOCS "Global extension tests")
+ BRIEF_DOCS "Global extension tests"
+ FULL_DOCS "Global extension tests")
set_property(GLOBAL PROPERTY EXTENSION-TESTS "")
macro(register_extension_test extension-dir)
- if (NOT SKIP_TESTS)
- get_property(extensions GLOBAL PROPERTY EXTENSION-TESTS)
- set_property(GLOBAL APPEND PROPERTY EXTENSION-TESTS "${extension-dir}")
- endif()
+ if(NOT SKIP_TESTS)
+ get_property(extensions GLOBAL PROPERTY EXTENSION-TESTS)
+ set_property(GLOBAL APPEND PROPERTY EXTENSION-TESTS "${extension-dir}")
+ endif()
endmacro()
function(registerTest dirName)
- if (NOT SKIP_TESTS)
- add_subdirectory(${dirName})
- endif()
+ if(NOT SKIP_TESTS)
+ add_subdirectory(${dirName})
+ endif()
endfunction(registerTest)
macro(register_extension_linter target-name)
- if (ENABLE_LINTER)
- get_property(extensions GLOBAL PROPERTY EXTENSION-LINTERS)
- set_property(GLOBAL APPEND PROPERTY EXTENSION-LINTERS "${target-name}")
- add_custom_target(${target-name}
- COMMAND python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${CMAKE_CURRENT_LIST_DIR}/)
- endif()
+ if(ENABLE_LINTER)
+ get_property(extensions GLOBAL PROPERTY EXTENSION-LINTERS)
+ set_property(GLOBAL APPEND PROPERTY EXTENSION-LINTERS "${target-name}")
+ add_custom_target(${target-name}
+ COMMAND python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${CMAKE_CURRENT_LIST_DIR}/)
+ endif()
endmacro()
function(get_component_name extension-name output)
- # component names can only contain [a-zA-Z_]
- string(REPLACE "-" "_" result ${extension-name})
- string(REPLACE "minifi_" "" result "${result}")
- set("${output}" "${result}" PARENT_SCOPE)
+ # component names can only contain [a-zA-Z_]
+ string(REPLACE "-" "_" result ${extension-name})
+ string(REPLACE "minifi_" "" result "${result}")
+ set("${output}" "${result}" PARENT_SCOPE)
endfunction()
diff --git a/cmake/FindBash.cmake b/cmake/FindBash.cmake
index f9784c96f..c816a2b9a 100644
--- a/cmake/FindBash.cmake
+++ b/cmake/FindBash.cmake
@@ -32,40 +32,40 @@ Example usage:
set(_doc "Bash command line executable")
if(CMAKE_HOST_WIN32)
- # First search the directories under the user's AppData
- set(_bash_path
- "$ENV{LOCALAPPDATA}/Programs/Git/bin"
- "$ENV{LOCALAPPDATA}/Programs/Git/usr/bin"
- "$ENV{APPDATA}/Programs/Git/bin"
- "$ENV{APPDATA}/Programs/Git/usr/bin"
- )
- find_program(Bash_EXECUTABLE
- NAMES bash
- NO_DEFAULT_PATH
- PATHS ${_bash_path}
- DOC ${_doc}
- )
-
- # Now look for installations in Git/ directories under typical installation
- # prefixes on Windows.
- find_program(Bash_EXECUTABLE
- NAMES bash
- NO_SYSTEM_ENVIRONMENT_PATH
- PATH_SUFFIXES Git/usr/bin Git/bin GnuWin32/bin
- DOC ${_doc}
- )
-
- unset(_bash_path)
+ # First search the directories under the user's AppData
+ set(_bash_path
+ "$ENV{LOCALAPPDATA}/Programs/Git/bin"
+ "$ENV{LOCALAPPDATA}/Programs/Git/usr/bin"
+ "$ENV{APPDATA}/Programs/Git/bin"
+ "$ENV{APPDATA}/Programs/Git/usr/bin"
+ )
+ find_program(Bash_EXECUTABLE
+ NAMES bash
+ NO_DEFAULT_PATH
+ PATHS ${_bash_path}
+ DOC ${_doc}
+ )
+
+ # Now look for installations in Git/ directories under typical installation
+ # prefixes on Windows.
+ find_program(Bash_EXECUTABLE
+ NAMES bash
+ NO_SYSTEM_ENVIRONMENT_PATH
+ PATH_SUFFIXES Git/usr/bin Git/bin GnuWin32/bin
+ DOC ${_doc}
+ )
+
+ unset(_bash_path)
else()
- find_program(Bash_EXECUTABLE
- NAMES bash
- DOC ${_doc}
- )
+ find_program(Bash_EXECUTABLE
+ NAMES bash
+ DOC ${_doc}
+ )
endif()
if(Bash_EXECUTABLE AND NOT TARGET Bash::bash)
- add_executable(Bash::bash IMPORTED)
- set_property(TARGET Bash::bash PROPERTY IMPORTED_LOCATION ${Bash_EXECUTABLE})
+ add_executable(Bash::bash IMPORTED)
+ set_property(TARGET Bash::bash PROPERTY IMPORTED_LOCATION ${Bash_EXECUTABLE})
endif()
unset(_doc)
diff --git a/cmake/FindMaven.cmake b/cmake/FindMaven.cmake
index 0151d3132..b5f4e7e02 100644
--- a/cmake/FindMaven.cmake
+++ b/cmake/FindMaven.cmake
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-set (MAVEN_HINT_UNIX /usr/bin CACHE STRING "maven default directory")
+set(MAVEN_HINT_UNIX /usr/bin CACHE STRING "maven default directory")
if (WIN32)
find_program(MAVEN_EXECUTABLE NAMES mvn.bat mvn)
@@ -26,8 +26,8 @@ endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args (Maven
- FOUND_VAR MAVEN_FOUND
- REQUIRED_VARS MAVEN_EXECUTABLE
+ FOUND_VAR MAVEN_FOUND
+ REQUIRED_VARS MAVEN_EXECUTABLE
)
mark_as_advanced(MAVEN_FOUND MAVEN_EXECUTABLE)
diff --git a/cmake/FindPCAP.cmake b/cmake/FindPCAP.cmake
index 7f5ac8bf2..177356be7 100644
--- a/cmake/FindPCAP.cmake
+++ b/cmake/FindPCAP.cmake
@@ -20,21 +20,21 @@
# PCAP_INCLUDE_DIR The location of PCAP headers
find_path(PCAP_INCLUDE_DIR
- NAMES pcap.h
- HINTS ${PCAP_ROOT_DIR}/include)
+ NAMES pcap.h
+ HINTS ${PCAP_ROOT_DIR}/include)
find_library(PCAP_LIBRARIES
- NAMES pcap
- HINTS ${PCAP_ROOT_DIR}/lib)
+ NAMES pcap
+ HINTS ${PCAP_ROOT_DIR}/lib)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
- PCAP
- DEFAULT_MSG
- PCAP_LIBRARIES
- PCAP_INCLUDE_DIR)
+ PCAP
+ DEFAULT_MSG
+ PCAP_LIBRARIES
+ PCAP_INCLUDE_DIR)
mark_as_advanced(
- PCAP_ROOT_DIR
- PCAP_LIBRARIES
- PCAP_INCLUDE_DIR)
+ PCAP_ROOT_DIR
+ PCAP_LIBRARIES
+ PCAP_INCLUDE_DIR)
diff --git a/cmake/FindPatch.cmake b/cmake/FindPatch.cmake
index a81e0ebe9..f63708fb6 100644
--- a/cmake/FindPatch.cmake
+++ b/cmake/FindPatch.cmake
@@ -31,34 +31,34 @@ set(_doc "Patch command line executable")
set(_patch_path )
if(CMAKE_HOST_WIN32)
- set(_patch_path
- "$ENV{LOCALAPPDATA}/Programs/Git/bin"
- "$ENV{LOCALAPPDATA}/Programs/Git/usr/bin"
- "$ENV{APPDATA}/Programs/Git/bin"
- "$ENV{APPDATA}/Programs/Git/usr/bin"
- )
+ set(_patch_path
+ "$ENV{LOCALAPPDATA}/Programs/Git/bin"
+ "$ENV{LOCALAPPDATA}/Programs/Git/usr/bin"
+ "$ENV{APPDATA}/Programs/Git/bin"
+ "$ENV{APPDATA}/Programs/Git/usr/bin"
+ )
endif()
# First search the PATH
find_program(Patch_EXECUTABLE
- NAME patch
- PATHS ${_patch_path}
- DOC ${_doc}
- )
-
-if(CMAKE_HOST_WIN32)
- # Now look for installations in Git/ directories under typical installation
- # prefixes on Windows.
- find_program(Patch_EXECUTABLE
- NAMES patch
- PATH_SUFFIXES Git/usr/bin Git/bin GnuWin32/bin
+ NAME patch
+ PATHS ${_patch_path}
DOC ${_doc}
)
+
+if(CMAKE_HOST_WIN32)
+ # Now look for installations in Git/ directories under typical installation
+ # prefixes on Windows.
+ find_program(Patch_EXECUTABLE
+ NAMES patch
+ PATH_SUFFIXES Git/usr/bin Git/bin GnuWin32/bin
+ DOC ${_doc}
+ )
endif()
if(Patch_EXECUTABLE AND NOT TARGET Patch::patch)
- add_executable(Patch::patch IMPORTED)
- set_property(TARGET Patch::patch PROPERTY IMPORTED_LOCATION ${Patch_EXECUTABLE})
+ add_executable(Patch::patch IMPORTED)
+ set_property(TARGET Patch::patch PROPERTY IMPORTED_LOCATION ${Patch_EXECUTABLE})
endif()
unset(_patch_path)
diff --git a/cmake/FindTensorFlow.cmake b/cmake/FindTensorFlow.cmake
index 2996048b0..0832734d5 100644
--- a/cmake/FindTensorFlow.cmake
+++ b/cmake/FindTensorFlow.cmake
@@ -19,19 +19,19 @@ include(FindPackageHandleStandardArgs)
unset(TENSORFLOW_FOUND)
if (TENSORFLOW_INCLUDE_PATH)
- message("-- Checking for TensorFlow includes in provided TENSORFLOW_INCLUDE_PATH: ${TENSORFLOW_INCLUDE_PATH}")
+ message("-- Checking for TensorFlow includes in provided TENSORFLOW_INCLUDE_PATH: ${TENSORFLOW_INCLUDE_PATH}")
endif()
if (TENSORFLOW_LIB_PATH)
- message("-- Checking for TensorFlow libs in provided TENSORFLOW_LIB_PATH: ${TENSORFLOW_LIB_PATH}")
+ message("-- Checking for TensorFlow libs in provided TENSORFLOW_LIB_PATH: ${TENSORFLOW_LIB_PATH}")
endif()
if (GOOGLE_PROTOBUF_INCLUDE_PATH)
- message("-- Checking for Google Protobuf includes in provided GOOGLE_PROTOBUF_INCLUDE_PATH: ${GOOGLE_PROTOBUF_INCLUDE_PATH}")
+ message("-- Checking for Google Protobuf includes in provided GOOGLE_PROTOBUF_INCLUDE_PATH: ${GOOGLE_PROTOBUF_INCLUDE_PATH}")
endif()
if (GOOGLE_PROTOBUF_LIB_PATH)
- message("-- Checking for Google Protobuf libs in provided GOOGLE_PROTOBUF_LIB_PATH: ${GOOGLE_PROTOBUF_LIB_PATH}")
+ message("-- Checking for Google Protobuf libs in provided GOOGLE_PROTOBUF_LIB_PATH: ${GOOGLE_PROTOBUF_LIB_PATH}")
endif()
find_path(TENSORFLOW_INCLUDE_DIR
@@ -90,7 +90,7 @@ if(TENSORFLOW_FOUND)
${TENSORFLOW_INCLUDE_DIR}/tensorflow/contrib/makefile/gen/protobuf-host/include
${GOOGLE_PROTOBUF_INCLUDE})
else()
- message(FATAL_ERROR "TensorFlow or Google Protobuf dependency was not found. Check or set TENSORFLOW_INCLUDE_PATH, TENSORFLOW_LIB_PATH, GOOGLE_PROTOBUF_INCLUDE, GOOGLE_PROTOBUF_LIBRARY to TensorFlow build, Install libtensorflow_cc.so, libprotobuf.so and headers into the system, or disable the TensorFlow extension.")
+ message(FATAL_ERROR "TensorFlow or Google Protobuf dependency was not found. Check or set TENSORFLOW_INCLUDE_PATH, TENSORFLOW_LIB_PATH, GOOGLE_PROTOBUF_INCLUDE, GOOGLE_PROTOBUF_LIBRARY to TensorFlow build, Install libtensorflow_cc.so, libprotobuf.so and headers into the system, or disable the TensorFlow extension.")
endif()
mark_as_advanced(TENSORFLOW_INCLUDE_DIR TENSORFLOW_CC_LIBRARY GOOGLE_PROTOBUF_INCLUDE GOOGLE_PROTOBUF_LIBRARY)
diff --git a/cmake/MiNiFiOptions.cmake b/cmake/MiNiFiOptions.cmake
index b8905ae8e..9ef856893 100644
--- a/cmake/MiNiFiOptions.cmake
+++ b/cmake/MiNiFiOptions.cmake
@@ -60,8 +60,8 @@ add_minifi_option(USE_REAL_ODBC_TEST_DRIVER "Use SQLite ODBC driver in SQL exten
# different than "GNU Makefiles".
add_minifi_option (FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
add_minifi_option(AWS_ENABLE_UNITY_BUILD "If enabled, AWS SDK libraries will be built as a single, generated .cpp file. \
- This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
- and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)
+ This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
+ and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)
add_minifi_dependent_option(ASAN_BUILD "Uses AddressSanitizer to instrument the code" OFF "NOT WIN32" OFF)
diff --git a/cmake/iOS.cmake b/cmake/iOS.cmake
index b390a976d..2a2aafb13 100644
--- a/cmake/iOS.cmake
+++ b/cmake/iOS.cmake
@@ -47,180 +47,180 @@
# Thanks to the android-cmake project for providing the command
# Standard settings
-set (CMAKE_SYSTEM_NAME Darwin)
-set (CMAKE_SYSTEM_VERSION 1)
-set (UNIX True)
-set (APPLE True)
-set (IOS True)
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_SYSTEM_VERSION 1)
+set(UNIX True)
+set(APPLE True)
+set(IOS True)
# Required as of cmake 2.8.10
-set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
+set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
# Determine the cmake host system version so we know where to find the iOS SDKs
-find_program (CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
-if (CMAKE_UNAME)
- exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
- string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
-endif (CMAKE_UNAME)
+find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
+if(CMAKE_UNAME)
+ exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
+ string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
+endif(CMAKE_UNAME)
# Force the compilers to gcc for iOS
-include (CMakeForceCompiler)
+include(CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER (/usr/bin/gcc Apple)
CMAKE_FORCE_CXX_COMPILER (/usr/bin/g++ Apple)
set(CMAKE_AR ar CACHE FILEPATH "" FORCE)
# Skip the platform compiler checks for cross compiling
-set (CMAKE_CXX_COMPILER_WORKS TRUE)
-set (CMAKE_C_COMPILER_WORKS TRUE)
+set(CMAKE_CXX_COMPILER_WORKS TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)
# All iOS/Darwin specific settings - some may be redundant
-set (CMAKE_SHARED_LIBRARY_PREFIX "lib")
-set (CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
-set (CMAKE_SHARED_MODULE_PREFIX "lib")
-set (CMAKE_SHARED_MODULE_SUFFIX ".so")
-set (CMAKE_MODULE_EXISTS 1)
-set (CMAKE_DL_LIBS "")
-
-set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
-set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
-set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
-set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
-
-# Hidden visibilty is required for cxx on iOS
-set (CMAKE_C_FLAGS_INIT "")
-set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden")
-
-set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
-set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
-
-set (CMAKE_PLATFORM_HAS_INSTALLNAME 1)
-set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
-set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
-set (CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
-set (CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
-set (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+set(CMAKE_SHARED_MODULE_PREFIX "lib")
+set(CMAKE_SHARED_MODULE_SUFFIX ".so")
+set(CMAKE_MODULE_EXISTS 1)
+set(CMAKE_DL_LIBS "")
+
+set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
+set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
+set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
+
+# Hidden visibilty is required for cxx on iOS
+set(CMAKE_C_FLAGS_INIT "")
+set(CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden")
+
+set(CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
+set(CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
+
+set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
+set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
-if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
- find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
-endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+if(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+ find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+endif(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
# Setup iOS platform unless specified manually with IOS_PLATFORM
-if (NOT DEFINED IOS_PLATFORM)
- set (IOS_PLATFORM "OS")
-endif (NOT DEFINED IOS_PLATFORM)
-set (IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform")
+if(NOT DEFINED IOS_PLATFORM)
+ set(IOS_PLATFORM "OS")
+endif(NOT DEFINED IOS_PLATFORM)
+set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform")
# Setup building for arm64 or not
-if (NOT DEFINED BUILD_ARM64)
- set (BUILD_ARM64 true)
-endif (NOT DEFINED BUILD_ARM64)
-set (BUILD_ARM64 ${BUILD_ARM64} CACHE STRING "Build arm64 arch or not")
+if(NOT DEFINED BUILD_ARM64)
+ set(BUILD_ARM64 true)
+endif(NOT DEFINED BUILD_ARM64)
+set(BUILD_ARM64 ${BUILD_ARM64} CACHE STRING "Build arm64 arch or not")
# Check the platform selection and setup for developer root
-if (${IOS_PLATFORM} STREQUAL "OS")
- set (IOS_PLATFORM_LOCATION "iPhoneOS.platform")
-
- # This causes the installers to properly locate the output libraries
- set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR")
- set (SIMULATOR true)
- set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
-
- # This causes the installers to properly locate the output libraries
- set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR64")
- set (SIMULATOR true)
- set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
-
- # This causes the installers to properly locate the output libraries
- set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
-else (${IOS_PLATFORM} STREQUAL "OS")
- message (FATAL_ERROR "Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR")
-endif (${IOS_PLATFORM} STREQUAL "OS")
+if(${IOS_PLATFORM} STREQUAL "OS")
+ set(IOS_PLATFORM_LOCATION "iPhoneOS.platform")
+
+ # This causes the installers to properly locate the output libraries
+ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR")
+ set(SIMULATOR true)
+ set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
+
+ # This causes the installers to properly locate the output libraries
+ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR64")
+ set(SIMULATOR true)
+ set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
+
+ # This causes the installers to properly locate the output libraries
+ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+else(${IOS_PLATFORM} STREQUAL "OS")
+ message(FATAL_ERROR "Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR")
+endif(${IOS_PLATFORM} STREQUAL "OS")
# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT
# Note Xcode 4.3 changed the installation location, choose the most recent one available
exec_program(/usr/bin/xcode-select ARGS -print-path OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR)
-set (XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
-set (XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
-if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
- if (EXISTS ${XCODE_POST_43_ROOT})
- set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT})
- elseif(EXISTS ${XCODE_PRE_43_ROOT})
- set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT})
- endif (EXISTS ${XCODE_POST_43_ROOT})
-endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
-set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")
+set(XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+set(XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+if(NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
+ if(EXISTS ${XCODE_POST_43_ROOT})
+ set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT})
+ elseif(EXISTS ${XCODE_PRE_43_ROOT})
+ set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT})
+ endif(EXISTS ${XCODE_POST_43_ROOT})
+endif(NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
+set(CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")
# Find and use the most recent iOS sdk unless specified manually with CMAKE_IOS_SDK_ROOT
-if (NOT DEFINED CMAKE_IOS_SDK_ROOT)
- file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
- if (_CMAKE_IOS_SDKS)
- list (SORT _CMAKE_IOS_SDKS)
- list (REVERSE _CMAKE_IOS_SDKS)
- list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
- else (_CMAKE_IOS_SDKS)
- message (FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.")
- endif (_CMAKE_IOS_SDKS)
- message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
-endif (NOT DEFINED CMAKE_IOS_SDK_ROOT)
-set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK")
+if(NOT DEFINED CMAKE_IOS_SDK_ROOT)
+ file(GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
+ if(_CMAKE_IOS_SDKS)
+ list(SORT _CMAKE_IOS_SDKS)
+ list(REVERSE _CMAKE_IOS_SDKS)
+ list(GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
+ else(_CMAKE_IOS_SDKS)
+ message(FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.")
+ endif(_CMAKE_IOS_SDKS)
+ message(STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
+endif(NOT DEFINED CMAKE_IOS_SDK_ROOT)
+set(CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK")
# Set the sysroot default to the most recent SDK
-set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")
+set(CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")
-# set the architecture for iOS
-if (${IOS_PLATFORM} STREQUAL "OS")
- set (IOS_ARCH armv7 armv7s arm64)
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR")
- set (IOS_ARCH i386)
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR64")
- set (IOS_ARCH x86_64)
-endif (${IOS_PLATFORM} STREQUAL "OS")
+# set the architecture for iOS
+if(${IOS_PLATFORM} STREQUAL "OS")
+ set(IOS_ARCH armv7 armv7s arm64)
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR")
+ set(IOS_ARCH i386)
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR64")
+ set(IOS_ARCH x86_64)
+endif(${IOS_PLATFORM} STREQUAL "OS")
-set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string "Build architecture for iOS")
+set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string "Build architecture for iOS")
# Set the find root to the iOS developer roots and to user defined paths
-set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root")
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root")
# default to searching for frameworks first
-set (CMAKE_FIND_FRAMEWORK FIRST)
+set(CMAKE_FIND_FRAMEWORK FIRST)
# set up the default search directories for frameworks
-set (CMAKE_SYSTEM_FRAMEWORK_PATH
- ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
- ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
- ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
+set(CMAKE_SYSTEM_FRAMEWORK_PATH
+ ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
+ ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
+ ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
)
# only search the iOS sdks, not the remainder of the host filesystem
-set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
-set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# This little macro lets you set any XCode specific property
-macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
- set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})
-endmacro (set_xcode_property)
+macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
+ set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})
+endmacro(set_xcode_property)
# This macro lets you find executable programs on the host system
-macro (find_host_package)
- set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
- set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
- set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
- set (IOS FALSE)
-
- find_package(${ARGN})
-
- set (IOS TRUE)
- set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
- set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
- set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endmacro (find_host_package)
+macro(find_host_package)
+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+ set(IOS FALSE)
+
+ find_package(${ARGN})
+
+ set(IOS TRUE)
+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endmacro(find_host_package)
diff --git a/cmake/opencv/FindOpenCV.cmake b/cmake/opencv/FindOpenCV.cmake
index 075d3606a..fa0bd4ae6 100644
--- a/cmake/opencv/FindOpenCV.cmake
+++ b/cmake/opencv/FindOpenCV.cmake
@@ -18,8 +18,8 @@
# Dummy OPENCV find for when we use bundled version
if(NOT OPENCV_FOUND)
- set(OPENCV_FOUND "YES" CACHE STRING "" FORCE)
- set(OPENCV_INCLUDE_DIR "${EXPORTED_OPENCV_INCLUDE_DIR}" CACHE STRING "" FORCE)
- set(OPENCV_LIBRARIES ${EXPORTED_OPENCV_LIBRARIES} CACHE STRING "" FORCE)
- set(OPENCV_VERSION "4.1.0" CACHE STRING "" FORCE)
+ set(OPENCV_FOUND "YES" CACHE STRING "" FORCE)
+ set(OPENCV_INCLUDE_DIR "${EXPORTED_OPENCV_INCLUDE_DIR}" CACHE STRING "" FORCE)
+ set(OPENCV_LIBRARIES ${EXPORTED_OPENCV_LIBRARIES} CACHE STRING "" FORCE)
+ set(OPENCV_VERSION "4.1.0" CACHE STRING "" FORCE)
endif()
diff --git a/cmake/rocksdb/sys/FindRocksDB.cmake b/cmake/rocksdb/sys/FindRocksDB.cmake
index 657918abd..abe8a1d3d 100644
--- a/cmake/rocksdb/sys/FindRocksDB.cmake
+++ b/cmake/rocksdb/sys/FindRocksDB.cmake
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -46,15 +46,15 @@ mark_as_advanced(
)
if(ROCKSDB_INCLUDE_DIR AND ROCKSDB_LIBRARIES)
- set(ROCKSDB_FOUND "YES")
- message(STATUS "Found RocksDB...${ROCKSDB_LIBRARIES}")
+ set(ROCKSDB_FOUND "YES")
+ message(STATUS "Found RocksDB...${ROCKSDB_LIBRARIES}")
endif()
if(NOT TARGET RocksDB::RocksDB)
- add_library(RocksDB::RocksDB UNKNOWN IMPORTED)
- set_target_properties(RocksDB::RocksDB PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${ROCKSDB_INCLUDE_DIR}")
- set_target_properties(RocksDB::RocksDB PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
- IMPORTED_LOCATION "${ROCKSDB_LIBRARIES}")
-endif()
\ No newline at end of file
+ add_library(RocksDB::RocksDB UNKNOWN IMPORTED)
+ set_target_properties(RocksDB::RocksDB PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${ROCKSDB_INCLUDE_DIR}")
+ set_target_properties(RocksDB::RocksDB PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+ IMPORTED_LOCATION "${ROCKSDB_LIBRARIES}")
+endif()
diff --git a/cmake/ssl/FindOpenSSL.cmake b/cmake/ssl/FindOpenSSL.cmake
index 087b1ce06..0dc22d891 100644
--- a/cmake/ssl/FindOpenSSL.cmake
+++ b/cmake/ssl/FindOpenSSL.cmake
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,28 +18,28 @@
# Dummy OpenSSL find for when we use bundled version
if(NOT OPENSSL_FOUND)
- set(OPENSSL_FOUND "YES" CACHE STRING "" FORCE)
- set(OPENSSL_INCLUDE_DIR "${EXPORTED_OPENSSL_INCLUDE_DIR}" CACHE STRING "" FORCE)
- set(OPENSSL_CRYPTO_LIBRARY "${EXPORTED_OPENSSL_CRYPTO_LIBRARY}" CACHE STRING "" FORCE)
- set(OPENSSL_SSL_LIBRARY "${EXPORTED_OPENSSL_SSL_LIBRARY}" CACHE STRING "" FORCE)
- set(OPENSSL_LIBRARIES ${EXPORTED_OPENSSL_LIBRARIES} CACHE STRING "" FORCE)
- set(OPENSSL_VERSION "1.0.2" CACHE STRING "" FORCE)
+ set(OPENSSL_FOUND "YES" CACHE STRING "" FORCE)
+ set(OPENSSL_INCLUDE_DIR "${EXPORTED_OPENSSL_INCLUDE_DIR}" CACHE STRING "" FORCE)
+ set(OPENSSL_CRYPTO_LIBRARY "${EXPORTED_OPENSSL_CRYPTO_LIBRARY}" CACHE STRING "" FORCE)
+ set(OPENSSL_SSL_LIBRARY "${EXPORTED_OPENSSL_SSL_LIBRARY}" CACHE STRING "" FORCE)
+ set(OPENSSL_LIBRARIES ${EXPORTED_OPENSSL_LIBRARIES} CACHE STRING "" FORCE)
+ set(OPENSSL_VERSION "1.0.2" CACHE STRING "" FORCE)
endif()
if(NOT TARGET OpenSSL::Crypto)
- add_library(OpenSSL::Crypto UNKNOWN IMPORTED)
- set_target_properties(OpenSSL::Crypto PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
- set_target_properties(OpenSSL::Crypto PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
+ add_library(OpenSSL::Crypto UNKNOWN IMPORTED)
+ set_target_properties(OpenSSL::Crypto PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
+ set_target_properties(OpenSSL::Crypto PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
endif()
if(NOT TARGET OpenSSL::SSL)
- add_library(OpenSSL::SSL UNKNOWN IMPORTED)
- set_target_properties(OpenSSL::SSL PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
- set_target_properties(OpenSSL::SSL PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
+ add_library(OpenSSL::SSL UNKNOWN IMPORTED)
+ set_target_properties(OpenSSL::SSL PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
+ set_target_properties(OpenSSL::SSL PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
endif()
diff --git a/cmake/winflexbison/FindBISON.cmake b/cmake/winflexbison/FindBISON.cmake
index c0de56519..5e391930c 100644
--- a/cmake/winflexbison/FindBISON.cmake
+++ b/cmake/winflexbison/FindBISON.cmake
@@ -119,117 +119,117 @@
#=============================================================================
if(BISON_EXECUTABLE)
- # the bison commands should be executed with the C locale, otherwise
- # the message (which are parsed) may be translated
- set(_Bison_SAVED_LC_ALL "$ENV{LC_ALL}")
- set(ENV{LC_ALL} C)
-
- execute_process(COMMAND ${BISON_EXECUTABLE} --version
- OUTPUT_VARIABLE BISON_version_output
- ERROR_VARIABLE BISON_version_error
- RESULT_VARIABLE BISON_version_result
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- set(ENV{LC_ALL} ${_Bison_SAVED_LC_ALL})
-
- if(NOT ${BISON_version_result} EQUAL 0)
- message(SEND_ERROR "Command \"${BISON_EXECUTABLE} --version\" failed with output:\n${BISON_version_error}")
- else()
- # Bison++
- if("${BISON_version_output}" MATCHES "^bison\\+\\+ Version ([^,]+)")
- set(BISON_VERSION "${CMAKE_MATCH_1}")
- # GNU Bison
- elseif("${BISON_version_output}" MATCHES "^bison \\(GNU Bison\\) ([^\n]+)\n")
- set(BISON_VERSION "${CMAKE_MATCH_1}")
- elseif("${BISON_version_output}" MATCHES "^GNU Bison (version )?([^\n]+)")
- set(BISON_VERSION "${CMAKE_MATCH_2}")
- endif()
- endif()
-
- # internal macro
- macro(BISON_TARGET_option_verbose Name BisonOutput filename)
- list(APPEND BISON_TARGET_cmdopt "--verbose")
- get_filename_component(BISON_TARGET_output_path "${BisonOutput}" PATH)
- get_filename_component(BISON_TARGET_output_name "${BisonOutput}" NAME_WE)
- add_custom_command(OUTPUT ${filename}
- COMMAND ${CMAKE_COMMAND}
- ARGS -E copy
- "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
- "${filename}"
- DEPENDS
- "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
- COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}"
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
- set(BISON_${Name}_VERBOSE_FILE ${filename})
- list(APPEND BISON_TARGET_extraoutputs
- "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output")
- endmacro()
-
- # internal macro
- macro(BISON_TARGET_option_extraopts Options)
- set(BISON_TARGET_extraopts "${Options}")
- separate_arguments(BISON_TARGET_extraopts)
- list(APPEND BISON_TARGET_cmdopt ${BISON_TARGET_extraopts})
- endmacro()
-
- #============================================================
- # BISON_TARGET (public macro)
- #============================================================
- #
- macro(BISON_TARGET Name BisonInput BisonOutput)
- set(BISON_TARGET_output_header "")
- set(BISON_TARGET_cmdopt "")
- set(BISON_TARGET_outputs "${BisonOutput}")
- if(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
- message(SEND_ERROR "Usage")
+ # the bison commands should be executed with the C locale, otherwise
+ # the message (which are parsed) may be translated
+ set(_Bison_SAVED_LC_ALL "$ENV{LC_ALL}")
+ set(ENV{LC_ALL} C)
+
+ execute_process(COMMAND ${BISON_EXECUTABLE} --version
+ OUTPUT_VARIABLE BISON_version_output
+ ERROR_VARIABLE BISON_version_error
+ RESULT_VARIABLE BISON_version_result
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ set(ENV{LC_ALL} ${_Bison_SAVED_LC_ALL})
+
+ if(NOT ${BISON_version_result} EQUAL 0)
+ message(SEND_ERROR "Command \"${BISON_EXECUTABLE} --version\" failed with output:\n${BISON_version_error}")
else()
- # Parsing parameters
- if(${ARGC} GREATER 5 OR ${ARGC} EQUAL 5)
- if("${ARGV3}" STREQUAL "VERBOSE")
- BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV4}")
- endif()
- if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
- BISON_TARGET_option_extraopts("${ARGV4}")
+ # Bison++
+ if("${BISON_version_output}" MATCHES "^bison\\+\\+ Version ([^,]+)")
+ set(BISON_VERSION "${CMAKE_MATCH_1}")
+ # GNU Bison
+ elseif("${BISON_version_output}" MATCHES "^bison \\(GNU Bison\\) ([^\n]+)\n")
+ set(BISON_VERSION "${CMAKE_MATCH_1}")
+ elseif("${BISON_version_output}" MATCHES "^GNU Bison (version )?([^\n]+)")
+ set(BISON_VERSION "${CMAKE_MATCH_2}")
endif()
- endif()
+ endif()
- if(${ARGC} EQUAL 7)
- if("${ARGV5}" STREQUAL "VERBOSE")
- BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV6}")
+ # internal macro
+ macro(BISON_TARGET_option_verbose Name BisonOutput filename)
+ list(APPEND BISON_TARGET_cmdopt "--verbose")
+ get_filename_component(BISON_TARGET_output_path "${BisonOutput}" PATH)
+ get_filename_component(BISON_TARGET_output_name "${BisonOutput}" NAME_WE)
+ add_custom_command(OUTPUT ${filename}
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy
+ "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
+ "${filename}"
+ DEPENDS
+ "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
+ COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}"
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+ set(BISON_${Name}_VERBOSE_FILE ${filename})
+ list(APPEND BISON_TARGET_extraoutputs
+ "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output")
+ endmacro()
+
+ # internal macro
+ macro(BISON_TARGET_option_extraopts Options)
+ set(BISON_TARGET_extraopts "${Options}")
+ separate_arguments(BISON_TARGET_extraopts)
+ list(APPEND BISON_TARGET_cmdopt ${BISON_TARGET_extraopts})
+ endmacro()
+
+ #============================================================
+ # BISON_TARGET (public macro)
+ #============================================================
+ #
+ macro(BISON_TARGET Name BisonInput BisonOutput)
+ set(BISON_TARGET_output_header "")
+ set(BISON_TARGET_cmdopt "")
+ set(BISON_TARGET_outputs "${BisonOutput}")
+ if(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
+ message(SEND_ERROR "Usage")
+ else()
+ # Parsing parameters
+ if(${ARGC} GREATER 5 OR ${ARGC} EQUAL 5)
+ if("${ARGV3}" STREQUAL "VERBOSE")
+ BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV4}")
+ endif()
+ if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
+ BISON_TARGET_option_extraopts("${ARGV4}")
+ endif()
endif()
- if("${ARGV5}" STREQUAL "COMPILE_FLAGS")
- BISON_TARGET_option_extraopts("${ARGV6}")
+ if(${ARGC} EQUAL 7)
+ if("${ARGV5}" STREQUAL "VERBOSE")
+ BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV6}")
+ endif()
+
+ if("${ARGV5}" STREQUAL "COMPILE_FLAGS")
+ BISON_TARGET_option_extraopts("${ARGV6}")
+ endif()
endif()
- endif()
-
- # Header's name generated by bison (see option -d)
- list(APPEND BISON_TARGET_cmdopt "-d")
- string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\2" _fileext "${ARGV2}")
- string(REPLACE "c" "h" _fileext ${_fileext})
- string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1${_fileext}"
- BISON_${Name}_OUTPUT_HEADER "${ARGV2}")
- list(APPEND BISON_TARGET_outputs "${BISON_${Name}_OUTPUT_HEADER}")
-
- add_custom_command(OUTPUT ${BISON_TARGET_outputs}
- ${BISON_TARGET_extraoutputs}
- COMMAND ${BISON_EXECUTABLE}
- ARGS ${BISON_TARGET_cmdopt} -o ${ARGV2} ${ARGV1}
- DEPENDS ${ARGV1}
- COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
- # define target variables
- set(BISON_${Name}_DEFINED TRUE)
- set(BISON_${Name}_INPUT ${ARGV1})
- set(BISON_${Name}_OUTPUTS ${BISON_TARGET_outputs})
- set(BISON_${Name}_COMPILE_FLAGS ${BISON_TARGET_cmdopt})
- set(BISON_${Name}_OUTPUT_SOURCE "${BisonOutput}")
- endif()
- endmacro()
- #
- #============================================================
+ # Header's name generated by bison (see option -d)
+ list(APPEND BISON_TARGET_cmdopt "-d")
+ string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\2" _fileext "${ARGV2}")
+ string(REPLACE "c" "h" _fileext ${_fileext})
+ string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1${_fileext}"
+ BISON_${Name}_OUTPUT_HEADER "${ARGV2}")
+ list(APPEND BISON_TARGET_outputs "${BISON_${Name}_OUTPUT_HEADER}")
+
+ add_custom_command(OUTPUT ${BISON_TARGET_outputs}
+ ${BISON_TARGET_extraoutputs}
+ COMMAND ${BISON_EXECUTABLE}
+ ARGS ${BISON_TARGET_cmdopt} -o ${ARGV2} ${ARGV1}
+ DEPENDS ${ARGV1}
+ COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ # define target variables
+ set(BISON_${Name}_DEFINED TRUE)
+ set(BISON_${Name}_INPUT ${ARGV1})
+ set(BISON_${Name}_OUTPUTS ${BISON_TARGET_outputs})
+ set(BISON_${Name}_COMPILE_FLAGS ${BISON_TARGET_cmdopt})
+ set(BISON_${Name}_OUTPUT_SOURCE "${BisonOutput}")
+
+ endif()
+ endmacro()
+ #
+ #============================================================
endif()
@@ -237,4 +237,4 @@ endif()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON REQUIRED_VARS BISON_EXECUTABLE
VERSION_VAR BISON_VERSION)
-# FindBISON.cmake ends here
\ No newline at end of file
+# FindBISON.cmake ends here
diff --git a/cmake/winflexbison/FindFLEX.cmake b/cmake/winflexbison/FindFLEX.cmake
index 0df8067ce..88056966b 100644
--- a/cmake/winflexbison/FindFLEX.cmake
+++ b/cmake/winflexbison/FindFLEX.cmake
@@ -149,10 +149,10 @@
#=============================================================================
find_library(FL_LIBRARY NAMES fl
- DOC "Path to the fl library")
+ DOC "Path to the fl library")
find_path(FLEX_INCLUDE_DIR FlexLexer.h
- DOC "Path to the flex headers")
+ DOC "Path to the flex headers")
mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR)
@@ -161,84 +161,84 @@ set(FLEX_LIBRARIES ${FL_LIBRARY})
if(FLEX_EXECUTABLE)
- execute_process(COMMAND ${FLEX_EXECUTABLE} --version
- OUTPUT_VARIABLE FLEX_version_output
- ERROR_VARIABLE FLEX_version_error
- RESULT_VARIABLE FLEX_version_result
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(NOT ${FLEX_version_result} EQUAL 0)
- if(FLEX_FIND_REQUIRED)
- message(SEND_ERROR "Command \"${FLEX_EXECUTABLE} --version\" failed with output:\n${FLEX_version_output}\n${FLEX_version_error}")
- else()
- message("Command \"${FLEX_EXECUTABLE} --version\" failed with output:\n${FLEX_version_output}\n${FLEX_version_error}\nFLEX_VERSION will not be available")
- endif()
- else()
- # older versions of flex printed "/full/path/to/executable version X.Y"
- # newer versions use "basename(executable) X.Y"
- get_filename_component(FLEX_EXE_NAME_WE "${FLEX_EXECUTABLE}" NAME_WE)
- get_filename_component(FLEX_EXE_EXT "${FLEX_EXECUTABLE}" EXT)
- string(REGEX REPLACE "^.*${FLEX_EXE_NAME_WE}(${FLEX_EXE_EXT})?\"? (version )?([0-9]+[^ ]*)( .*)?$" "\\3"
- FLEX_VERSION "${FLEX_version_output}")
- unset(FLEX_EXE_EXT)
- unset(FLEX_EXE_NAME_WE)
- endif()
-
- #============================================================
- # FLEX_TARGET (public macro)
- #============================================================
- #
- macro(FLEX_TARGET Name Input Output)
- set(FLEX_TARGET_usage "FLEX_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>]")
- if(${ARGC} GREATER 3)
- if(${ARGC} EQUAL 5)
- if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
- set(FLEX_EXECUTABLE_opts "${ARGV4}")
- separate_arguments(FLEX_EXECUTABLE_opts)
+ execute_process(COMMAND ${FLEX_EXECUTABLE} --version
+ OUTPUT_VARIABLE FLEX_version_output
+ ERROR_VARIABLE FLEX_version_error
+ RESULT_VARIABLE FLEX_version_result
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT ${FLEX_version_result} EQUAL 0)
+ if(FLEX_FIND_REQUIRED)
+ message(SEND_ERROR "Command \"${FLEX_EXECUTABLE} --version\" failed with output:\n${FLEX_version_output}\n${FLEX_version_error}")
else()
- message(SEND_ERROR ${FLEX_TARGET_usage})
+ message("Command \"${FLEX_EXECUTABLE} --version\" failed with output:\n${FLEX_version_output}\n${FLEX_version_error}\nFLEX_VERSION will not be available")
endif()
- else()
- message(SEND_ERROR ${FLEX_TARGET_usage})
- endif()
+ else()
+ # older versions of flex printed "/full/path/to/executable version X.Y"
+ # newer versions use "basename(executable) X.Y"
+ get_filename_component(FLEX_EXE_NAME_WE "${FLEX_EXECUTABLE}" NAME_WE)
+ get_filename_component(FLEX_EXE_EXT "${FLEX_EXECUTABLE}" EXT)
+ string(REGEX REPLACE "^.*${FLEX_EXE_NAME_WE}(${FLEX_EXE_EXT})?\"? (version )?([0-9]+[^ ]*)( .*)?$" "\\3"
+ FLEX_VERSION "${FLEX_version_output}")
+ unset(FLEX_EXE_EXT)
+ unset(FLEX_EXE_NAME_WE)
endif()
- add_custom_command(OUTPUT ${Output}
- COMMAND ${FLEX_EXECUTABLE}
- ARGS ${FLEX_EXECUTABLE_opts} --wincompat -o${Output} ${Input}
- DEPENDS ${Input}
- COMMENT "[FLEX][${Name}] Building scanner with flex ${FLEX_VERSION}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
- set(FLEX_${Name}_DEFINED TRUE)
- set(FLEX_${Name}_OUTPUTS ${Output})
- set(FLEX_${Name}_INPUT ${Input})
- set(FLEX_${Name}_COMPILE_FLAGS ${FLEX_EXECUTABLE_opts})
- endmacro()
- #============================================================
-
-
- #============================================================
- # ADD_FLEX_BISON_DEPENDENCY (public macro)
- #============================================================
- #
- macro(ADD_FLEX_BISON_DEPENDENCY FlexTarget BisonTarget)
-
- if(NOT FLEX_${FlexTarget}_OUTPUTS)
- message(SEND_ERROR "Flex target `${FlexTarget}' does not exists.")
- endif()
+ #============================================================
+ # FLEX_TARGET (public macro)
+ #============================================================
+ #
+ macro(FLEX_TARGET Name Input Output)
+ set(FLEX_TARGET_usage "FLEX_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>]")
+ if(${ARGC} GREATER 3)
+ if(${ARGC} EQUAL 5)
+ if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
+ set(FLEX_EXECUTABLE_opts "${ARGV4}")
+ separate_arguments(FLEX_EXECUTABLE_opts)
+ else()
+ message(SEND_ERROR ${FLEX_TARGET_usage})
+ endif()
+ else()
+ message(SEND_ERROR ${FLEX_TARGET_usage})
+ endif()
+ endif()
- if(NOT BISON_${BisonTarget}_OUTPUT_HEADER)
- message(SEND_ERROR "Bison target `${BisonTarget}' does not exists.")
- endif()
+ add_custom_command(OUTPUT ${Output}
+ COMMAND ${FLEX_EXECUTABLE}
+ ARGS ${FLEX_EXECUTABLE_opts} --wincompat -o${Output} ${Input}
+ DEPENDS ${Input}
+ COMMENT "[FLEX][${Name}] Building scanner with flex ${FLEX_VERSION}"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ set(FLEX_${Name}_DEFINED TRUE)
+ set(FLEX_${Name}_OUTPUTS ${Output})
+ set(FLEX_${Name}_INPUT ${Input})
+ set(FLEX_${Name}_COMPILE_FLAGS ${FLEX_EXECUTABLE_opts})
+ endmacro()
+ #============================================================
+
+
+ #============================================================
+ # ADD_FLEX_BISON_DEPENDENCY (public macro)
+ #============================================================
+ #
+ macro(ADD_FLEX_BISON_DEPENDENCY FlexTarget BisonTarget)
+
+ if(NOT FLEX_${FlexTarget}_OUTPUTS)
+ message(SEND_ERROR "Flex target `${FlexTarget}' does not exists.")
+ endif()
+
+ if(NOT BISON_${BisonTarget}_OUTPUT_HEADER)
+ message(SEND_ERROR "Bison target `${BisonTarget}' does not exists.")
+ endif()
- set_source_files_properties(${FLEX_${FlexTarget}_OUTPUTS}
- PROPERTIES OBJECT_DEPENDS ${BISON_${BisonTarget}_OUTPUT_HEADER})
- endmacro()
- #============================================================
+ set_source_files_properties(${FLEX_${FlexTarget}_OUTPUTS}
+ PROPERTIES OBJECT_DEPENDS ${BISON_${BisonTarget}_OUTPUT_HEADER})
+ endmacro()
+ #============================================================
endif()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLEX REQUIRED_VARS FLEX_EXECUTABLE
VERSION_VAR FLEX_VERSION)
-# FindFLEX.cmake ends here
\ No newline at end of file
+# FindFLEX.cmake ends here
diff --git a/cmake/zlib/dummy/FindZLIB.cmake b/cmake/zlib/dummy/FindZLIB.cmake
index 43730f5ac..4df824030 100644
--- a/cmake/zlib/dummy/FindZLIB.cmake
+++ b/cmake/zlib/dummy/FindZLIB.cmake
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,21 +17,21 @@
# Dummy zlib find for when we use bundled version
if(NOT ZLIB_FOUND)
- set(ZLIB_FOUND "YES" CACHE STRING "" FORCE)
- set(ZLIB_INCLUDE_DIR "${EXPORTED_ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE)
- set(ZLIB_INCLUDE_DIRS "${EXPORTED_ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE)
- set(ZLIB_LIBRARIES "${EXPORTED_ZLIB_LIBRARIES}" CACHE STRING "" FORCE)
- set(ZLIB_VERSION_STRING "${EXPORTED_ZLIB_VERSION_STRING}" CACHE STRING "" FORCE)
- set(ZLIB_VERSION_MAJOR "${EXPORTED_ZLIB_VERSION_MAJOR}" CACHE STRING "" FORCE)
- set(ZLIB_VERSION_MINOR "${EXPORTED_ZLIB_VERSION_MINOR}" CACHE STRING "" FORCE)
- set(ZLIB_VERSION_PATCH "${EXPORTED_ZLIB_VERSION_PATCH}" CACHE STRING "" FORCE)
+ set(ZLIB_FOUND "YES" CACHE STRING "" FORCE)
+ set(ZLIB_INCLUDE_DIR "${EXPORTED_ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE)
+ set(ZLIB_INCLUDE_DIRS "${EXPORTED_ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE)
+ set(ZLIB_LIBRARIES "${EXPORTED_ZLIB_LIBRARIES}" CACHE STRING "" FORCE)
+ set(ZLIB_VERSION_STRING "${EXPORTED_ZLIB_VERSION_STRING}" CACHE STRING "" FORCE)
+ set(ZLIB_VERSION_MAJOR "${EXPORTED_ZLIB_VERSION_MAJOR}" CACHE STRING "" FORCE)
+ set(ZLIB_VERSION_MINOR "${EXPORTED_ZLIB_VERSION_MINOR}" CACHE STRING "" FORCE)
+ set(ZLIB_VERSION_PATCH "${EXPORTED_ZLIB_VERSION_PATCH}" CACHE STRING "" FORCE)
endif()
if(NOT TARGET ZLIB::ZLIB)
- add_library(ZLIB::ZLIB STATIC IMPORTED)
- set_target_properties(ZLIB::ZLIB PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
- set_target_properties(ZLIB::ZLIB PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${ZLIB_LIBRARIES}")
-endif()
\ No newline at end of file
+ add_library(ZLIB::ZLIB STATIC IMPORTED)
+ set_target_properties(ZLIB::ZLIB PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
+ set_target_properties(ZLIB::ZLIB PROPERTIES
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION "${ZLIB_LIBRARIES}")
+endif()
diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt
index 215f819df..728c2636f 100644
--- a/controller/CMakeLists.txt
+++ b/controller/CMakeLists.txt
@@ -22,9 +22,9 @@ cmake_minimum_required(VERSION 3.16)
include_directories(../main/ ../libminifi/include ../libminifi/include/c2 ../libminifi/include/c2/protocols/ ../libminifi/include/core/state ./libminifi/include/core/statemanagement/metrics ../libminifi/include/core/yaml ../libminifi/include/core)
if(WIN32)
- include_directories(../libminifi/opsys/win)
+ include_directories(../libminifi/opsys/win)
else()
- include_directories(../libminifi/opsys/posix)
+ include_directories(../libminifi/opsys/posix)
endif()
include(CppVersion)
@@ -34,17 +34,17 @@ add_executable(minificontroller MiNiFiController.cpp ../main/MainHelper.cpp)
target_link_libraries(minificontroller ${LIBMINIFI} cxxopts Threads::Threads)
set_target_properties(minificontroller PROPERTIES
- OUTPUT_NAME minificontroller
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ OUTPUT_NAME minificontroller
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
if (NOT WIN32)
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- target_link_options(minificontroller PRIVATE "-Wl,--disable-new-dtags")
- endif()
- set_target_properties(minificontroller PROPERTIES INSTALL_RPATH "$ORIGIN")
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ target_link_options(minificontroller PRIVATE "-Wl,--disable-new-dtags")
+ endif()
+ set_target_properties(minificontroller PROPERTIES INSTALL_RPATH "$ORIGIN")
endif()
install(TARGETS minificontroller RUNTIME DESTINATION bin COMPONENT bin)
add_custom_command(TARGET minificontroller POST_BUILD
- COMMAND cat ${CMAKE_BINARY_DIR}/all.log)
+ COMMAND cat ${CMAKE_BINARY_DIR}/all.log)
diff --git a/encrypt-config/CMakeLists.txt b/encrypt-config/CMakeLists.txt
index df4dd6e24..7be46f8f4 100644
--- a/encrypt-config/CMakeLists.txt
+++ b/encrypt-config/CMakeLists.txt
@@ -24,9 +24,9 @@ set_target_properties(encrypt-config PROPERTIES OUTPUT_NAME encrypt-config)
set_target_properties(encrypt-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
if (NOT WIN32)
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- target_link_options(encrypt-config PRIVATE "-Wl,--disable-new-dtags")
- endif()
- set_target_properties(encrypt-config PROPERTIES INSTALL_RPATH "$ORIGIN")
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ target_link_options(encrypt-config PRIVATE "-Wl,--disable-new-dtags")
+ endif()
+ set_target_properties(encrypt-config PROPERTIES INSTALL_RPATH "$ORIGIN")
endif()
install(TARGETS encrypt-config RUNTIME DESTINATION bin COMPONENT bin)
diff --git a/encrypt-config/tests/CMakeLists.txt b/encrypt-config/tests/CMakeLists.txt
index 2379e9159..4fda1f727 100644
--- a/encrypt-config/tests/CMakeLists.txt
+++ b/encrypt-config/tests/CMakeLists.txt
@@ -23,20 +23,20 @@ list(REMOVE_ITEM ENCRYPT_CONFIG_SOURCES "${CMAKE_SOURCE_DIR}/encrypt-config/Encr
set(ENCRYPT_CONFIG_TEST_COUNT 0)
foreach(testfile ${ENCRYPT_CONFIG_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable(${testfilename} "${testfile}" ${ENCRYPT_CONFIG_SOURCES})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable(${testfilename} "${testfile}" ${ENCRYPT_CONFIG_SOURCES})
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/encrypt-config")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/encrypt-config")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
- createTests(${testfilename})
+ createTests(${testfilename})
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} ${LIBMINIFI} ${TEST_BASE_LIB})
- add_test(NAME ${testfilename} COMMAND ${testfilename} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} ${LIBMINIFI} ${TEST_BASE_LIB})
+ add_test(NAME ${testfilename} COMMAND ${testfilename} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
- math(EXPR ENCRYPT_CONFIG_TEST_COUNT "${ENCRYPT_CONFIG_TEST_COUNT}+1")
+ math(EXPR ENCRYPT_CONFIG_TEST_COUNT "${ENCRYPT_CONFIG_TEST_COUNT}+1")
endforeach()
message("-- Finished building ${ENCRYPT_CONFIG_TEST_COUNT} encrypt-config test file(s)...")
diff --git a/extensions/aws/CMakeLists.txt b/extensions/aws/CMakeLists.txt
index 4d778a5ca..706c6be73 100644
--- a/extensions/aws/CMakeLists.txt
+++ b/extensions/aws/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_AWS))
- return()
+ return()
endif()
include(BundledAwsSdkCpp)
@@ -37,8 +37,8 @@ target_wholearchive_library_private(minifi-aws AWS::aws-cpp-sdk-s3)
get_target_property(AWS_SDK_INCLUDE_DIRS AWS::aws-cpp-sdk-s3 INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(minifi-aws INTERFACE ${AWS_SDK_INCLUDE_DIRS})
if(WIN32)
- target_compile_definitions(minifi-aws INTERFACE "AWS_CORE_API=__declspec(dllimport)")
- target_compile_definitions(minifi-aws INTERFACE "AWS_S3_API=__declspec(dllimport)")
+ target_compile_definitions(minifi-aws INTERFACE "AWS_CORE_API=__declspec(dllimport)")
+ target_compile_definitions(minifi-aws INTERFACE "AWS_S3_API=__declspec(dllimport)")
endif()
register_extension(minifi-aws "AWS EXTENSIONS" AWS-EXTENSIONS "This enables AWS support" "${TEST_DIR}/aws-tests")
diff --git a/extensions/azure/CMakeLists.txt b/extensions/azure/CMakeLists.txt
index 1acb612ba..34c1ab50b 100644
--- a/extensions/azure/CMakeLists.txt
+++ b/extensions/azure/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_AZURE))
- return()
+ return()
endif()
include(BundledAzureSdkCpp)
@@ -42,7 +42,7 @@ target_link_libraries(minifi-azure CURL::libcurl LibXml2::LibXml2)
target_link_libraries(minifi-azure AZURE::azure-storage-files-datalake AZURE::azure-storage-blobs AZURE::azure-storage-common AZURE::azure-core AZURE::azure-identity)
if (WIN32)
- target_link_libraries(minifi-azure crypt32.lib bcrypt.lib)
+ target_link_libraries(minifi-azure crypt32.lib bcrypt.lib)
endif()
register_extension(minifi-azure "AZURE EXTENSIONS" AZURE-EXTENSIONS "This enables Azure support" "${TEST_DIR}/azure-tests")
diff --git a/extensions/bustache/CMakeLists.txt b/extensions/bustache/CMakeLists.txt
index ae08d608b..3d800fa5e 100644
--- a/extensions/bustache/CMakeLists.txt
+++ b/extensions/bustache/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT ENABLE_BUSTACHE)
- return()
+ return()
endif()
include(BundledBustache)
diff --git a/extensions/civetweb/CMakeLists.txt b/extensions/civetweb/CMakeLists.txt
index 7c41ebb99..0678305f9 100644
--- a/extensions/civetweb/CMakeLists.txt
+++ b/extensions/civetweb/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (DISABLE_CIVET)
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/coap/CMakeLists.txt b/extensions/coap/CMakeLists.txt
index 5bba1fd05..d1de0e31d 100644
--- a/extensions/coap/CMakeLists.txt
+++ b/extensions/coap/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_COAP STREQUAL "ON"))
- return()
+ return()
endif()
include(BundledLibCoAP)
diff --git a/extensions/coap/tests/CMakeLists.txt b/extensions/coap/tests/CMakeLists.txt
index 8ef0d88a0..472331563 100644
--- a/extensions/coap/tests/CMakeLists.txt
+++ b/extensions/coap/tests/CMakeLists.txt
@@ -22,35 +22,35 @@ file(GLOB COAP_INTEGRATION_TESTS "*.cpp")
SET(CURL_INT_TEST_COUNT 0)
if (NOT DISABLE_CURL)
-FOREACH(testfile ${COAP_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE "../server")
- target_include_directories(${testfilename} BEFORE PRIVATE "../nanofi")
- target_include_directories(${testfilename} BEFORE PRIVATE "../protocols")
- target_include_directories(${testfilename} BEFORE PRIVATE "../controllerservice")
- target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/client/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/protocols/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/sitetosite/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/civetweb/")
- target_include_directories(${testfilename} BEFORE PRIVATE ./include)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-coap)
- target_link_libraries(${testfilename} minifi-civet-extensions)
- target_link_libraries(${testfilename} minifi-http-curl)
- target_link_libraries(${testfilename} minifi-standard-processors)
+ FOREACH(testfile ${COAP_INTEGRATION_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../server")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../nanofi")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../protocols")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../controllerservice")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/client/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/protocols/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../../http-curl/sitetosite/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/civetweb/")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-coap)
+ target_link_libraries(${testfilename} minifi-civet-extensions)
+ target_link_libraries(${testfilename} minifi-http-curl)
+ target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
-ENDFOREACH()
+ MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
+ ENDFOREACH()
-message("-- Finished building ${CURL_INT_TEST_COUNT} CoAP integration test file(s)...")
+ message("-- Finished building ${CURL_INT_TEST_COUNT} CoAP integration test file(s)...")
-add_test(NAME CoapC2VerifyHeartbeat COMMAND CoapC2VerifyHeartbeat "${TEST_RESOURCES}/CoapC2VerifyServe.yml" "${TEST_RESOURCES}/" "http://localhost:9888/geturl")
+ add_test(NAME CoapC2VerifyHeartbeat COMMAND CoapC2VerifyHeartbeat "${TEST_RESOURCES}/CoapC2VerifyServe.yml" "${TEST_RESOURCES}/" "http://localhost:9888/geturl")
else()
-message("-- CoAP tests rely on minifi-http-curl, so they will not be built...")
+ message("-- CoAP tests rely on minifi-http-curl, so they will not be built...")
endif()
diff --git a/extensions/elasticsearch/CMakeLists.txt b/extensions/elasticsearch/CMakeLists.txt
index ad8c6f5b7..35634a02c 100644
--- a/extensions/elasticsearch/CMakeLists.txt
+++ b/extensions/elasticsearch/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_ELASTICSEARCH))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt
index bca4816eb..55d1f9a7c 100644
--- a/extensions/expression-language/CMakeLists.txt
+++ b/extensions/expression-language/CMakeLists.txt
@@ -18,65 +18,65 @@
#
if (DISABLE_EXPRESSION_LANGUAGE)
- return()
+ return()
endif()
message("minifi-expression-language-extensions will depend on curl-external")
if(WIN32)
- include(FetchContent)
-
- set(BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-
- FetchContent_Declare(
- winflexbison
- GIT_REPOSITORY "https://github.com/lexxmark/winflexbison.git"
- GIT_TAG "a72f3d6b5102b65f064a5054ba634d3d62e94f41"
- )
- FetchContent_GetProperties("winflexbison")
-
- if(NOT winflexbison_POPULATED)
- FetchContent_Populate("winflexbison")
- execute_process(
- COMMAND ${CMAKE_COMMAND} .
- WORKING_DIRECTORY ${winflexbison_SOURCE_DIR}
- RESULT_VARIABLE result
- OUTPUT_VARIABLE bisonbuild
- ERROR_VARIABLE bisonbuildE
- )
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} --build . --config RelWithDebInfo
- WORKING_DIRECTORY ${winflexbison_SOURCE_DIR}
- RESULT_VARIABLE result
- OUTPUT_VARIABLE bisonbuild
- ERROR_VARIABLE bisonbuildE
- )
-
- file(COPY ${winflexbison_SOURCE_DIR}/bison/Data DESTINATION ${winflexbison_SOURCE_DIR}/bison/RelWithDebInfo/)
- endif()
-
- set(BISON_EXECUTABLE "${winflexbison_SOURCE_DIR}/bison/RelWithDebInfo/win_bison.exe" CACHE PATH "bison executable")
- set(FLEX_EXECUTABLE "${winflexbison_SOURCE_DIR}/flex/RelWithDebInfo/win_flex.exe" CACHE PATH "flex executable")
-
- include_directories(${winflexbison_SOURCE_DIR}/flex/src/)
-
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/winflexbison")
+ include(FetchContent)
+
+ set(BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+
+ FetchContent_Declare(
+ winflexbison
+ GIT_REPOSITORY "https://github.com/lexxmark/winflexbison.git"
+ GIT_TAG "a72f3d6b5102b65f064a5054ba634d3d62e94f41"
+ )
+ FetchContent_GetProperties("winflexbison")
+
+ if(NOT winflexbison_POPULATED)
+ FetchContent_Populate("winflexbison")
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} .
+ WORKING_DIRECTORY ${winflexbison_SOURCE_DIR}
+ RESULT_VARIABLE result
+ OUTPUT_VARIABLE bisonbuild
+ ERROR_VARIABLE bisonbuildE
+ )
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} --build . --config RelWithDebInfo
+ WORKING_DIRECTORY ${winflexbison_SOURCE_DIR}
+ RESULT_VARIABLE result
+ OUTPUT_VARIABLE bisonbuild
+ ERROR_VARIABLE bisonbuildE
+ )
+
+ file(COPY ${winflexbison_SOURCE_DIR}/bison/Data DESTINATION ${winflexbison_SOURCE_DIR}/bison/RelWithDebInfo/)
+ endif()
+
+ set(BISON_EXECUTABLE "${winflexbison_SOURCE_DIR}/bison/RelWithDebInfo/win_bison.exe" CACHE PATH "bison executable")
+ set(FLEX_EXECUTABLE "${winflexbison_SOURCE_DIR}/flex/RelWithDebInfo/win_flex.exe" CACHE PATH "flex executable")
+
+ include_directories(${winflexbison_SOURCE_DIR}/flex/src/)
+
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/winflexbison")
endif()
find_package(BISON REQUIRED)
find_package(FLEX REQUIRED)
bison_target(
- el-parser
- ${CMAKE_CURRENT_SOURCE_DIR}/Parser.yy
- ${CMAKE_CURRENT_SOURCE_DIR}/Parser.cpp
+ el-parser
+ ${CMAKE_CURRENT_SOURCE_DIR}/Parser.yy
+ ${CMAKE_CURRENT_SOURCE_DIR}/Parser.cpp
)
flex_target(
- el-scanner
- ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll
- ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.cpp
+ el-scanner
+ ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll
+ ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.cpp
COMPILE_FLAGS --c++
)
@@ -88,19 +88,19 @@ include_directories(common)
include_directories(impl)
if(WIN32)
- include_directories(../../libminifi/opsys/win)
- set(SOCKET_SOURCES "src/io/win/*.cpp")
+ include_directories(../../libminifi/opsys/win)
+ set(SOCKET_SOURCES "src/io/win/*.cpp")
else()
- include_directories(../../libminifi/opsys/posix)
- set(SOCKET_SOURCES "src/io/posix/*.cpp")
+ include_directories(../../libminifi/opsys/posix)
+ set(SOCKET_SOURCES "src/io/posix/*.cpp")
endif()
file(GLOB SOURCES "*.cpp")
if (NOT WIN32)
- set_source_files_properties(${BISON_el-parser_OUTPUTS} PROPERTIES COMPILE_FLAGS -Wno-error)
- set_source_files_properties(${FLEX_el-scanner_OUTPUTS} PROPERTIES COMPILE_FLAGS -Wno-error)
+ set_source_files_properties(${BISON_el-parser_OUTPUTS} PROPERTIES COMPILE_FLAGS -Wno-error)
+ set_source_files_properties(${FLEX_el-scanner_OUTPUTS} PROPERTIES COMPILE_FLAGS -Wno-error)
endif()
add_library(minifi-expression-language-extensions SHARED ${SOURCES} ${BISON_el-parser_OUTPUTS} ${FLEX_el-scanner_OUTPUTS})
diff --git a/extensions/expression-language/tests/CMakeLists.txt b/extensions/expression-language/tests/CMakeLists.txt
index 2214ef57b..86e078ea2 100644
--- a/extensions/expression-language/tests/CMakeLists.txt
+++ b/extensions/expression-language/tests/CMakeLists.txt
@@ -22,25 +22,25 @@ file(GLOB EXPRESSION_LANGUAGE_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${EXPRESSION_LANGUAGE_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable(${testfilename} "${testfile}")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
- createTests(${testfilename})
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- if(NOT DISABLE_CURL)
- target_link_libraries(${testfilename} CURL::libcurl)
- endif()
- target_link_libraries(${testfilename} minifi-expression-language-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_compile_definitions("${testfilename}" PRIVATE TZ_DATA_DIR="${CMAKE_BINARY_DIR}/tzdata")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable(${testfilename} "${testfile}")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
+ createTests(${testfilename})
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ if(NOT DISABLE_CURL)
+ target_link_libraries(${testfilename} CURL::libcurl)
+ endif()
+ target_link_libraries(${testfilename} minifi-expression-language-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_compile_definitions("${testfilename}" PRIVATE TZ_DATA_DIR="${CMAKE_BINARY_DIR}/tzdata")
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME ${testfilename} COMMAND ${testfilename} WORKING_DIRECTORY ${TEST_DIR})
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME ${testfilename} COMMAND ${testfilename} WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
@@ -51,21 +51,21 @@ file(GLOB INT_EXPRESSION_LANGUAGE_TESTS "integration/*.cpp")
SET(INT_EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${INT_EXPRESSION_LANGUAGE_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable(${testfilename} "${testfile}")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
- createTests(${testfilename})
- if(NOT DISABLE_CURL)
- target_link_libraries(${testfilename} CURL::libcurl)
- endif()
- target_link_libraries(${testfilename} minifi-expression-language-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable(${testfilename} "${testfile}")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/catch")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
+ createTests(${testfilename})
+ if(NOT DISABLE_CURL)
+ target_link_libraries(${testfilename} CURL::libcurl)
+ endif()
+ target_link_libraries(${testfilename} minifi-expression-language-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR EXTENSIONS_TEST_COUNT "${INT_EXTENSIONS_TEST_COUNT}+1")
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${INT_EXTENSIONS_TEST_COUNT}+1")
ENDFOREACH()
diff --git a/extensions/gcp/CMakeLists.txt b/extensions/gcp/CMakeLists.txt
index 9edc4df0c..0f8c0c62f 100644
--- a/extensions/gcp/CMakeLists.txt
+++ b/extensions/gcp/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_GCP))
- return()
+ return()
endif()
include(GoogleCloudCpp)
diff --git a/extensions/gps/CMakeLists.txt b/extensions/gps/CMakeLists.txt
index abe383cd3..033efcb32 100644
--- a/extensions/gps/CMakeLists.txt
+++ b/extensions/gps/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_GPS))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/http-curl/CMakeLists.txt b/extensions/http-curl/CMakeLists.txt
index 785b222a3..67edd3129 100644
--- a/extensions/http-curl/CMakeLists.txt
+++ b/extensions/http-curl/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (DISABLE_CURL OR DISABLE_CIVET)
- return()
+ return()
endif()
message("minifi-http-curl will depend on curl-external")
diff --git a/extensions/http-curl/tests/CMakeLists.txt b/extensions/http-curl/tests/CMakeLists.txt
index 8bc0c134f..d24d0ac9e 100644
--- a/extensions/http-curl/tests/CMakeLists.txt
+++ b/extensions/http-curl/tests/CMakeLists.txt
@@ -23,45 +23,45 @@ file(GLOB CURL_INTEGRATION_TESTS "*.cpp")
SET(CURL_INT_TEST_COUNT 0)
FOREACH(testfile ${CURL_UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../protocols/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../sitetosite/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/civetweb/")
- target_include_directories(${testfilename} BEFORE PRIVATE ./include)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-http-curl)
- target_link_libraries(${testfilename} minifi-civet-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../protocols/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../sitetosite/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/civetweb/")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-http-curl)
+ target_link_libraries(${testfilename} minifi-civet-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
FOREACH(testfile ${CURL_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../protocols/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../sitetosite/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/civetweb/")
- target_include_directories(${testfilename} BEFORE PRIVATE ./include)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-http-curl)
- target_link_libraries(${testfilename} minifi-civet-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../protocols/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../sitetosite/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/civetweb/")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-http-curl)
+ target_link_libraries(${testfilename} minifi-civet-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
+ MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
ENDFOREACH()
message("-- Finished building ${CURL_INT_TEST_COUNT} libcURL integration test file(s)...")
@@ -77,14 +77,14 @@ add_test(NAME C2FailedUpdateTest COMMAND C2FailedUpdateTest "${TEST_RESOURCES}/T
add_test(NAME C2NullConfiguration COMMAND C2NullConfiguration "${TEST_RESOURCES}/TestNull.yml" "${TEST_RESOURCES}/")
add_test(NAME C2RequestClassTest COMMAND C2RequestClassTest)
if (NOT OPENSSL_OFF)
- add_test(NAME VerifyInvokeHTTPGetTestSecure COMMAND VerifyInvokeHTTPGetTest "${TEST_RESOURCES}/TestHTTPGetSecure.yml" "${TEST_RESOURCES}/")
- add_test(NAME C2VerifyHeartbeatAndStopSecure COMMAND C2VerifyHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStopSecure.yml" "${TEST_RESOURCES}/")
- add_test(NAME C2VerifyLightweightHeartbeatAndStopSecure COMMAND C2VerifyLightweightHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStopSecure.yml" "${TEST_RESOURCES}/")
- add_test(NAME VerifyInvokeHTTPPostTestSecure COMMAND VerifyInvokeHTTPPostTest "${TEST_RESOURCES}/TestInvokeHTTPPostSecure.yml" "${TEST_RESOURCES}/")
+ add_test(NAME VerifyInvokeHTTPGetTestSecure COMMAND VerifyInvokeHTTPGetTest "${TEST_RESOURCES}/TestHTTPGetSecure.yml" "${TEST_RESOURCES}/")
+ add_test(NAME C2VerifyHeartbeatAndStopSecure COMMAND C2VerifyHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStopSecure.yml" "${TEST_RESOURCES}/")
+ add_test(NAME C2VerifyLightweightHeartbeatAndStopSecure COMMAND C2VerifyLightweightHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStopSecure.yml" "${TEST_RESOURCES}/")
+ add_test(NAME VerifyInvokeHTTPPostTestSecure COMMAND VerifyInvokeHTTPPostTest "${TEST_RESOURCES}/TestInvokeHTTPPostSecure.yml" "${TEST_RESOURCES}/")
endif()
add_test(NAME HttpPostIntegrationTest COMMAND HttpPostIntegrationTest "${TEST_RESOURCES}/TestHTTPPost.yml" "${TEST_RESOURCES}/")
if (NOT APPLE)
- add_test(NAME HttpPostIntegrationTestChunked COMMAND HttpPostIntegrationTest "${TEST_RESOURCES}/TestHTTPPostChunkedEncoding.yml" "${TEST_RESOURCES}/")
+ add_test(NAME HttpPostIntegrationTestChunked COMMAND HttpPostIntegrationTest "${TEST_RESOURCES}/TestHTTPPostChunkedEncoding.yml" "${TEST_RESOURCES}/")
endif()
add_test(NAME C2VerifyServeResults COMMAND C2VerifyServeResults "${TEST_RESOURCES}/C2VerifyServeResults.yml" "${TEST_RESOURCES}/")
add_test(NAME C2VerifyHeartbeatAndStop COMMAND C2VerifyHeartbeatAndStop "${TEST_RESOURCES}/C2VerifyHeartbeatAndStop.yml")
diff --git a/extensions/jni/CMakeLists.txt b/extensions/jni/CMakeLists.txt
index b94ef5dc0..d66e19bcd 100644
--- a/extensions/jni/CMakeLists.txt
+++ b/extensions/jni/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if(NOT (ENABLE_ALL OR ENABLE_JNI))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
@@ -50,65 +50,65 @@ message("Building NiFi assembly for packaging ....")
# with an empty cmd before ${MAVEN_EXECUTABLE}. Until this is resolved ( or proven to be a non cmake issue on all versions)
# we should stick with the the minor duplication
if (WIN32)
-execute_process(COMMAND cmd /c "${MAVEN_EXECUTABLE}" "-q" "package" "-Denforcer.skip=true"
- WORKING_DIRECTORY "${JNI_ASSEMBLY_JAR_BIN}/nifi-minifi-jni-assembly"
- RESULT_VARIABLE mvn_result
- OUTPUT_VARIABLE mvn_output
- ERROR_VARIABLE mvn_error)
+ execute_process(COMMAND cmd /c "${MAVEN_EXECUTABLE}" "-q" "package" "-Denforcer.skip=true"
+ WORKING_DIRECTORY "${JNI_ASSEMBLY_JAR_BIN}/nifi-minifi-jni-assembly"
+ RESULT_VARIABLE mvn_result
+ OUTPUT_VARIABLE mvn_output
+ ERROR_VARIABLE mvn_error)
else()
-execute_process(COMMAND "${MAVEN_EXECUTABLE}" "-q" "package" "-Denforcer.skip=true"
- WORKING_DIRECTORY "${JNI_ASSEMBLY_JAR_BIN}/nifi-minifi-jni-assembly"
- RESULT_VARIABLE mvn_result
- OUTPUT_VARIABLE mvn_output
- ERROR_VARIABLE mvn_error)
+ execute_process(COMMAND "${MAVEN_EXECUTABLE}" "-q" "package" "-Denforcer.skip=true"
+ WORKING_DIRECTORY "${JNI_ASSEMBLY_JAR_BIN}/nifi-minifi-jni-assembly"
+ RESULT_VARIABLE mvn_result
+ OUTPUT_VARIABLE mvn_output
+ ERROR_VARIABLE mvn_error)
endif()
if("${mvn_result}" STREQUAL "0")
- message("${mvn_output}")
+ message("${mvn_output}")
- install(DIRECTORY "${JNI_ASSEMBLY_JAR_BIN}/nifi-minifi-jni-assembly/target/nifi-minifi-jni-minifi-jni/nifi-minifi-jni-1.9.0/minifi-jni"
- DESTINATION .
- COMPONENT bin)
+ install(DIRECTORY "${JNI_ASSEMBLY_JAR_BIN}/nifi-minifi-jni-assembly/target/nifi-minifi-jni-minifi-jni/nifi-minifi-jni-1.9.0/minifi-jni"
+ DESTINATION .
+ COMPONENT bin)
else()
- message("Maven failed ${mvn_result} ${mvn_output} ${mvn_error}")
+ message("Maven failed ${mvn_result} ${mvn_output} ${mvn_error}")
endif()
message("Building NiFi JNI Jar for packaging ....")
if (WIN32)
-execute_process(COMMAND cmd /c "${MAVEN_EXECUTABLE}" "-q" "package"
- WORKING_DIRECTORY "${JNI_FRAMEWORK_JAR_BIN}/nifi-framework-jni"
- RESULT_VARIABLE mvn_result
- OUTPUT_VARIABLE mvn_output
- ERROR_VARIABLE mvn_error)
+ execute_process(COMMAND cmd /c "${MAVEN_EXECUTABLE}" "-q" "package"
+ WORKING_DIRECTORY "${JNI_FRAMEWORK_JAR_BIN}/nifi-framework-jni"
+ RESULT_VARIABLE mvn_result
+ OUTPUT_VARIABLE mvn_output
+ ERROR_VARIABLE mvn_error)
else()
-execute_process(COMMAND "${MAVEN_EXECUTABLE}" "-q" "package"
- WORKING_DIRECTORY "${JNI_FRAMEWORK_JAR_BIN}/nifi-framework-jni"
- RESULT_VARIABLE mvn_result
- OUTPUT_VARIABLE mvn_output
- ERROR_VARIABLE mvn_error)
+ execute_process(COMMAND "${MAVEN_EXECUTABLE}" "-q" "package"
+ WORKING_DIRECTORY "${JNI_FRAMEWORK_JAR_BIN}/nifi-framework-jni"
+ RESULT_VARIABLE mvn_result
+ OUTPUT_VARIABLE mvn_output
+ ERROR_VARIABLE mvn_error)
endif()
if("${mvn_result}" STREQUAL "0")
- message("${mvn_output}")
- SET (JNI-FRAMEWORK-JAR "${JNI_FRAMEWORK_JAR_BIN}/nifi-framework-jni/target/nifi-framework-jni-1.9.0.jar")
- message("Produced ${JNI-FRAMEWORK-JAR}")
- message("${mvn_output}")
- install(FILES ${JNI-FRAMEWORK-JAR}
- DESTINATION minifi-jni/lib
- COMPONENT bin)
+ message("${mvn_output}")
+ SET (JNI-FRAMEWORK-JAR "${JNI_FRAMEWORK_JAR_BIN}/nifi-framework-jni/target/nifi-framework-jni-1.9.0.jar")
+ message("Produced ${JNI-FRAMEWORK-JAR}")
+ message("${mvn_output}")
+ install(FILES ${JNI-FRAMEWORK-JAR}
+ DESTINATION minifi-jni/lib
+ COMPONENT bin)
else()
- message("Maven could not be invoked to build the framework jar")
+ message("Maven could not be invoked to build the framework jar")
endif()
target_link_libraries (minifi-jni ${LIBMINIFI})
if (APPLE)
- target_link_libraries (minifi-jni ${JAVA_JVM_LIBRARY})
+ target_link_libraries (minifi-jni ${JAVA_JVM_LIBRARY})
elseif (WIN32)
- target_link_libraries (minifi-jni ${JAVA_JVM_LIBRARY})
- target_link_libraries (minifi-jni ${Java_LIBRARIES})
+ target_link_libraries (minifi-jni ${JAVA_JVM_LIBRARY})
+ target_link_libraries (minifi-jni ${Java_LIBRARIES})
else()
- target_link_libraries (minifi-jni ${JAVA_JVM_LIBRARY})
+ target_link_libraries (minifi-jni ${JAVA_JVM_LIBRARY})
endif()
register_extension(minifi-jni "JNI EXTENSIONS" JNI-EXTENSION "Enables JNI capabilities to support loading Java Classes." "${TEST_DIR}/jni-tests")
diff --git a/extensions/kubernetes/CMakeLists.txt b/extensions/kubernetes/CMakeLists.txt
index ef040b0c7..22f846f45 100644
--- a/extensions/kubernetes/CMakeLists.txt
+++ b/extensions/kubernetes/CMakeLists.txt
@@ -16,7 +16,7 @@
# under the License.
if (NOT ENABLE_KUBERNETES)
- return()
+ return()
endif()
include(KubernetesClientC)
diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt
index 59a10f9b0..674306dc7 100644
--- a/extensions/libarchive/CMakeLists.txt
+++ b/extensions/libarchive/CMakeLists.txt
@@ -18,19 +18,19 @@
#
if (DISABLE_LIBARCHIVE)
- return()
+ return()
endif()
if (NOT DISABLE_LZMA)
- include(BundledLibLZMA)
- use_bundled_liblzma(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy")
+ include(BundledLibLZMA)
+ use_bundled_liblzma(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy")
endif()
if (NOT DISABLE_BZIP2)
- include(BundledBZip2)
- use_bundled_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/bzip2/dummy")
+ include(BundledBZip2)
+ use_bundled_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/bzip2/dummy")
endif()
include(BundledLibArchive)
diff --git a/extensions/librdkafka/CMakeLists.txt b/extensions/librdkafka/CMakeLists.txt
index a8ec514bb..81002261d 100644
--- a/extensions/librdkafka/CMakeLists.txt
+++ b/extensions/librdkafka/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_LIBRDKAFKA))
- return()
+ return()
endif()
include(BundledLibRdKafka)
diff --git a/extensions/librdkafka/tests/CMakeLists.txt b/extensions/librdkafka/tests/CMakeLists.txt
index 439fccd8d..904bb50c0 100644
--- a/extensions/librdkafka/tests/CMakeLists.txt
+++ b/extensions/librdkafka/tests/CMakeLists.txt
@@ -21,15 +21,15 @@ file(GLOB KAFKA_INTEGRATION_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${KAFKA_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/librdkafka")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-rdkafka-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/librdkafka")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-rdkafka-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${KAFKA-EXTENSIONS_TEST_COUNT} Lib Kafka related test file(s)...")
diff --git a/extensions/mqtt/CMakeLists.txt b/extensions/mqtt/CMakeLists.txt
index 41a9cba7e..a7738c322 100644
--- a/extensions/mqtt/CMakeLists.txt
+++ b/extensions/mqtt/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if(NOT (ENABLE_ALL OR ENABLE_MQTT))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/opc/CMakeLists.txt b/extensions/opc/CMakeLists.txt
index b62df974a..e8e6dc08b 100644
--- a/extensions/opc/CMakeLists.txt
+++ b/extensions/opc/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT ENABLE_OPC)
- return()
+ return()
endif()
include(BundledMbedTLS)
diff --git a/extensions/opencv/CMakeLists.txt b/extensions/opencv/CMakeLists.txt
index c2969e92e..a7c647d05 100644
--- a/extensions/opencv/CMakeLists.txt
+++ b/extensions/opencv/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT ENABLE_OPENCV)
- return()
+ return()
endif()
include(BundledOpenCV)
diff --git a/extensions/opencv/tests/CMakeLists.txt b/extensions/opencv/tests/CMakeLists.txt
index f26b21ef3..68622cf7b 100644
--- a/extensions/opencv/tests/CMakeLists.txt
+++ b/extensions/opencv/tests/CMakeLists.txt
@@ -22,15 +22,15 @@ file(GLOB OPENCV_TESTS "*.cpp")
SET(OPENCV_TEST_COUNT 0)
FOREACH(testfile ${OPENCV_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/opencv/")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_link_libraries(${testfilename} minifi-opencv)
- target_link_libraries(${testfilename} minifi-standard-processors)
- createTests("${testfilename}")
- MATH(EXPR OPENCV_TEST_COUNT "${OPENCV_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/opencv/")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_link_libraries(${testfilename} minifi-opencv)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ createTests("${testfilename}")
+ MATH(EXPR OPENCV_TEST_COUNT "${OPENCV_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
ENDFOREACH()
message("-- Finished building ${OPENCV_TEST_COUNT} OpenCV related test file(s)...")
diff --git a/extensions/openwsman/CMakeLists.txt b/extensions/openwsman/CMakeLists.txt
index d6322600f..a628766ad 100644
--- a/extensions/openwsman/CMakeLists.txt
+++ b/extensions/openwsman/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL))
- return()
+ return()
endif()
include(BundledOpenWSMAN)
diff --git a/extensions/pcap/CMakeLists.txt b/extensions/pcap/CMakeLists.txt
index d3497da7d..a243a202a 100644
--- a/extensions/pcap/CMakeLists.txt
+++ b/extensions/pcap/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if(NOT (ENABLE_ALL OR ENABLE_PCAP))
- return()
+ return()
endif()
find_package(PCAP REQUIRED)
@@ -26,9 +26,9 @@ find_package(PCAP REQUIRED)
include(FetchContent)
FetchContent_Declare(pcapplusplus
- URL https://github.com/seladb/PcapPlusPlus/archive/refs/tags/v22.05.tar.gz
- URL_HASH SHA256=5f299c4503bf5d3c29f82b8d876a19be7dea29c2aadcb52f2f3b394846c21da9
- )
+ URL https://github.com/seladb/PcapPlusPlus/archive/refs/tags/v22.05.tar.gz
+ URL_HASH SHA256=5f299c4503bf5d3c29f82b8d876a19be7dea29c2aadcb52f2f3b394846c21da9
+ )
FetchContent_MakeAvailable(pcapplusplus)
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
@@ -42,17 +42,17 @@ set(PCAPPLUSPLUS_HEADER_DIR PCAPPLUSPLUS_HEADER_DIR PARENT_SCOPE)
file(COPY ${PCAPPLUSPLUS_TP_BASE_DIR} DESTINATION ${PCAPPLUSPLUS_BASE_DIR})
if (WIN32)
- execute_process(COMMAND ${PCAPPLUSPLUS_BASE_DIR}/configure-windows-visual-studio.bat WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR})
+ execute_process(COMMAND ${PCAPPLUSPLUS_BASE_DIR}/configure-windows-visual-studio.bat WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR})
elseif (APPLE)
- execute_process(COMMAND ${PCAPPLUSPLUS_BASE_DIR}/configure-mac_os_x.sh WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR})
+ execute_process(COMMAND ${PCAPPLUSPLUS_BASE_DIR}/configure-mac_os_x.sh WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR})
else ()
- execute_process(COMMAND ${PCAPPLUSPLUS_BASE_DIR}/configure-linux.sh --default WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR})
+ execute_process(COMMAND ${PCAPPLUSPLUS_BASE_DIR}/configure-linux.sh --default WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR})
endif ()
add_custom_target(
- pcappp
- COMMAND make libs
- WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR}
+ pcappp
+ COMMAND make libs
+ WORKING_DIRECTORY ${PCAPPLUSPLUS_BASE_DIR}
)
set(PCAPPLUSPLUS_LIB_DIR "${PCAPPLUSPLUS_BASE_DIR}/Dist")
@@ -66,9 +66,9 @@ add_dependencies(minifi-pcap pcappp)
target_link_libraries (minifi-pcap ${PCAPPLUSPLUS_LIB_DIR}/libPcap++.a ${PCAPPLUSPLUS_LIB_DIR}/libPacket++.a ${PCAPPLUSPLUS_LIB_DIR}/libCommon++.a ${PCAP_LIBRARIES})
if (APPLE)
- target_link_libraries(minifi-pcap "-framework CoreFoundation")
- target_link_libraries(minifi-pcap "-framework SystemConfiguration")
- set_target_properties(minifi-pcap PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")
+ target_link_libraries(minifi-pcap "-framework CoreFoundation")
+ target_link_libraries(minifi-pcap "-framework SystemConfiguration")
+ set_target_properties(minifi-pcap PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")
endif ()
target_link_libraries(minifi-pcap ${LIBMINIFI} Threads::Threads)
diff --git a/extensions/pdh/CMakeLists.txt b/extensions/pdh/CMakeLists.txt
index a459ec73b..633fd730f 100644
--- a/extensions/pdh/CMakeLists.txt
+++ b/extensions/pdh/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (WIN32 AND ENABLE_PDH))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/pdh/tests/CMakeLists.txt b/extensions/pdh/tests/CMakeLists.txt
index 6e7153c58..f8de542c0 100644
--- a/extensions/pdh/tests/CMakeLists.txt
+++ b/extensions/pdh/tests/CMakeLists.txt
@@ -21,17 +21,17 @@ file(GLOB PDH_TESTS "*.cpp")
SET(PDH_TEST_COUNT 0)
FOREACH(testfile ${PDH_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/pdh")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-pdh)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR PDH_TEST_COUNT "${PDH_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/pdh")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-pdh)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR PDH_TEST_COUNT "${PDH_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${PDH_TEST_COUNT} PDH related test file(s)...")
diff --git a/extensions/procfs/CMakeLists.txt b/extensions/procfs/CMakeLists.txt
index b809687a4..f7e5c0a8c 100644
--- a/extensions/procfs/CMakeLists.txt
+++ b/extensions/procfs/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND (ENABLE_ALL OR ENABLE_PROCFS)))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/prometheus/CMakeLists.txt b/extensions/prometheus/CMakeLists.txt
index b6d1001a8..380daad5b 100644
--- a/extensions/prometheus/CMakeLists.txt
+++ b/extensions/prometheus/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_PROMETHEUS OR ENABLE_ALL))
- return()
+ return()
endif()
include(Prometheus)
diff --git a/extensions/rocksdb-repos/CMakeLists.txt b/extensions/rocksdb-repos/CMakeLists.txt
index 902dd9875..e6f20ad35 100644
--- a/extensions/rocksdb-repos/CMakeLists.txt
+++ b/extensions/rocksdb-repos/CMakeLists.txt
@@ -18,15 +18,15 @@
#
if (DISABLE_ROCKSDB)
- return()
+ return()
endif()
if (BUILD_ROCKSDB)
- include(BundledRocksDB)
- use_bundled_rocksdb(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ include(BundledRocksDB)
+ use_bundled_rocksdb(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
else()
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/rocksdb/sys")
- find_package(RocksDB REQUIRED)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/rocksdb/sys")
+ find_package(RocksDB REQUIRED)
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/script/CMakeLists.txt b/extensions/script/CMakeLists.txt
index 04f4036ba..bc8145bf6 100644
--- a/extensions/script/CMakeLists.txt
+++ b/extensions/script/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(minifi-script-extensions ${LIBMINIFI} Threads::Threads)
if (NOT DISABLE_PYTHON_SCRIPTING)
find_package(PythonLibs 3.5)
if (NOT PYTHONLIBS_FOUND)
- find_package(PythonLibs 3.0 REQUIRED)
+ find_package(PythonLibs 3.0 REQUIRED)
endif()
include(Pybind11)
diff --git a/extensions/script/tests/CMakeLists.txt b/extensions/script/tests/CMakeLists.txt
index 43d86e2b2..1442241bd 100644
--- a/extensions/script/tests/CMakeLists.txt
+++ b/extensions/script/tests/CMakeLists.txt
@@ -18,79 +18,79 @@
#
if (NOT DISABLE_PYTHON_SCRIPTING)
- file(GLOB EXECUTESCRIPT_PYTHON_TESTS "TestExecuteScriptProcessorWithPythonScript.cpp" "PythonScriptEngineTests.cpp")
- file(GLOB EXECUTEPYTHONPROCESSOR_UNIT_TESTS "ExecutePythonProcessorTests.cpp")
- file(GLOB PY_SOURCES "python/*.cpp")
- find_package(PythonLibs 3.5)
- if (NOT PYTHONLIBS_FOUND)
- find_package(PythonLibs 3.0 REQUIRED)
- endif()
- file(COPY "${CMAKE_SOURCE_DIR}/extensions/script/tests/test_python_scripts" DESTINATION "${CMAKE_BINARY_DIR}/bin/")
+ file(GLOB EXECUTESCRIPT_PYTHON_TESTS "TestExecuteScriptProcessorWithPythonScript.cpp" "PythonScriptEngineTests.cpp")
+ file(GLOB EXECUTEPYTHONPROCESSOR_UNIT_TESTS "ExecutePythonProcessorTests.cpp")
+ file(GLOB PY_SOURCES "python/*.cpp")
+ find_package(PythonLibs 3.5)
+ if (NOT PYTHONLIBS_FOUND)
+ find_package(PythonLibs 3.0 REQUIRED)
+ endif()
+ file(COPY "${CMAKE_SOURCE_DIR}/extensions/script/tests/test_python_scripts" DESTINATION "${CMAKE_BINARY_DIR}/bin/")
endif()
if (ENABLE_LUA_SCRIPTING)
- file(GLOB EXECUTESCRIPT_LUA_TESTS "TestExecuteScriptProcessorWithLuaScript.cpp" "LuaScriptEngineTests.cpp")
+ file(GLOB EXECUTESCRIPT_LUA_TESTS "TestExecuteScriptProcessorWithLuaScript.cpp" "LuaScriptEngineTests.cpp")
endif()
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${EXECUTESCRIPT_PYTHON_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script/python")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/pybind11/include")
- add_definitions(-DPYTHON_SUPPORT)
- target_link_libraries(${testfilename} minifi-script-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- createTests("${testfilename}")
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script/python")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/pybind11/include")
+ add_definitions(-DPYTHON_SUPPORT)
+ target_link_libraries(${testfilename} minifi-script-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ createTests("${testfilename}")
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
FOREACH(testfile ${EXECUTEPYTHONPROCESSOR_UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
- include_directories(${PYTHON_INCLUDE_DIR})
- include_directories(SYSTEM ../../thirdparty/pybind11/include)
- include_directories(python)
- add_definitions(-DPYTHON_SUPPORT)
+ include_directories(${PYTHON_INCLUDE_DIR})
+ include_directories(SYSTEM ../../thirdparty/pybind11/include)
+ include_directories(python)
+ add_definitions(-DPYTHON_SUPPORT)
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script/python")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/pybind11/include")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script/python")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/pybind11/include")
- target_link_libraries(${testfilename} minifi-script-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-script-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- createTests("${testfilename}")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ createTests("${testfilename}")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
ENDFOREACH()
FOREACH(testfile ${EXECUTESCRIPT_LUA_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script/lua")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${SOL2_INCLUDE_DIR}")
- add_definitions(-DLUA_SUPPORT)
- target_link_libraries(${testfilename} minifi-script-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- createTests("${testfilename}")
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
- file(COPY "${CMAKE_SOURCE_DIR}/extensions/script/tests/test_lua_scripts" DESTINATION "${CMAKE_BINARY_DIR}/bin/")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/script/lua")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${SOL2_INCLUDE_DIR}")
+ add_definitions(-DLUA_SUPPORT)
+ target_link_libraries(${testfilename} minifi-script-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ createTests("${testfilename}")
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ file(COPY "${CMAKE_SOURCE_DIR}/extensions/script/tests/test_lua_scripts" DESTINATION "${CMAKE_BINARY_DIR}/bin/")
ENDFOREACH()
message("-- Finished building ${EXTENSIONS_TEST_COUNT} ExecuteScript related test file(s)...")
diff --git a/extensions/sensors/CMakeLists.txt b/extensions/sensors/CMakeLists.txt
index 990f85790..ea5267d8a 100644
--- a/extensions/sensors/CMakeLists.txt
+++ b/extensions/sensors/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if(NOT (ENABLE_ALL OR ENABLE_SENSORS))
- return()
+ return()
endif()
include(BundledRTIMULib)
diff --git a/extensions/sftp/CMakeLists.txt b/extensions/sftp/CMakeLists.txt
index 048d35f90..d153eea20 100644
--- a/extensions/sftp/CMakeLists.txt
+++ b/extensions/sftp/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT ((ENABLE_ALL OR ENABLE_SFTP) AND NOT DISABLE_CURL))
- return()
+ return()
endif()
include(BundledLibSSH2)
diff --git a/extensions/sftp/tests/CMakeLists.txt b/extensions/sftp/tests/CMakeLists.txt
index 89394ccf7..721344df8 100644
--- a/extensions/sftp/tests/CMakeLists.txt
+++ b/extensions/sftp/tests/CMakeLists.txt
@@ -24,41 +24,41 @@ find_package(Maven)
message(STATUS "MAVEN: ${MAVEN_EXECUTABLE}")
if (NOT SKIP_TESTS AND Java_FOUND AND Maven_FOUND AND NOT DISABLE_EXPRESSION_LANGUAGE)
- file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
- SET(SFTP-EXTENSIONS_TEST_COUNT 0)
- FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE ${LIBSSH2_INCLUDE_DIR})
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/sftp")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE ./include)
- target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
+ file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
+ SET(SFTP-EXTENSIONS_TEST_COUNT 0)
+ FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE ${LIBSSH2_INCLUDE_DIR})
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/sftp")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi sftp-test-tools)
- target_link_libraries(${testfilename} minifi-sftp)
- target_link_libraries(${testfilename} minifi-expression-language-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- if (NOT DISABLE_ROCKSDB)
- target_link_libraries(${testfilename} minifi-rocksdb-repos)
- endif()
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi sftp-test-tools)
+ target_link_libraries(${testfilename} minifi-sftp)
+ target_link_libraries(${testfilename} minifi-expression-language-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ if (NOT DISABLE_ROCKSDB)
+ target_link_libraries(${testfilename} minifi-rocksdb-repos)
+ endif()
- MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
- ENDFOREACH()
- message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related test file(s)...")
+ MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ ENDFOREACH()
+ message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related test file(s)...")
- # Copy test resources
- file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources" DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
+ # Copy test resources
+ file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources" DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
- add_subdirectory(tools)
+ add_subdirectory(tools)
else()
- message("Could find Java and Maven to build SFTPTestServer, disabling SFTP tests")
+ message("Could find Java and Maven to build SFTPTestServer, disabling SFTP tests")
endif()
diff --git a/extensions/splunk/CMakeLists.txt b/extensions/splunk/CMakeLists.txt
index 3c36bb3ce..ff9d15e07 100644
--- a/extensions/splunk/CMakeLists.txt
+++ b/extensions/splunk/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_SPLUNK))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/sql/CMakeLists.txt b/extensions/sql/CMakeLists.txt
index 9a0146797..e381443b7 100644
--- a/extensions/sql/CMakeLists.txt
+++ b/extensions/sql/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (ENABLE_ALL OR ENABLE_SQL))
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
@@ -31,47 +31,47 @@ file(GLOB SOURCES "*.cpp" "services/*.cpp" "processors/*.cpp" "data/*.cpp")
add_library(minifi-sql SHARED ${SOURCES})
if(WIN32)
- find_package(ODBC REQUIRED)
+ find_package(ODBC REQUIRED)
else()
- # Build iODBC
-
- # Define byproducts
- set(IODBC_BYPRODUCT "lib/libiodbc.a")
-
- set(IODBC_BYPRODUCT_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/iodbc-install/")
-
- # Build project
- ExternalProject_Add(
- iodbc-external
- URL "https://github.com/openlink/iODBC/archive/v3.52.14.tar.gz"
- URL_HASH "SHA256=896d7e16b283cf9a6f5b5f46e8e9549aef21a11935726b0170987cd4c59d16db"
- BUILD_IN_SOURCE true
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/iodbc-src"
- BUILD_COMMAND make
- CMAKE_COMMAND ""
- UPDATE_COMMAND ""
- INSTALL_COMMAND make install
- CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=${IODBC_BYPRODUCT_DIR} --with-pic
- STEP_TARGETS build
- BUILD_BYPRODUCTS "${IODBC_BYPRODUCT_DIR}/${IODBC_BYPRODUCT}"
- EXCLUDE_FROM_ALL TRUE
- )
-
- # Set variables
- set(IODBC_FOUND "YES" CACHE STRING "" FORCE)
- set(IODBC_INCLUDE_DIRS "${IODBC_BYPRODUCT_DIR}/include" CACHE STRING "" FORCE)
- set(IODBC_LIBRARIES "${IODBC_BYPRODUCT_DIR}/${IODBC_BYPRODUCT}" CACHE STRING "" FORCE)
-
- # Set exported variables for FindPackage.cmake
- set(EXPORTED_IODBC_INCLUDE_DIRS "${IODBC_INCLUDE_DIRS}" CACHE STRING "" FORCE)
- set(EXPORTED_IODBC_LIBRARIES "${IODBC_LIBRARIES}" CACHE STRING "" FORCE)
-
- # Create imported targets
- add_library(ODBC::ODBC STATIC IMPORTED)
- set_target_properties(ODBC::ODBC PROPERTIES IMPORTED_LOCATION "${IODBC_LIBRARIES}")
- add_dependencies(ODBC::ODBC iodbc-external)
- file(MAKE_DIRECTORY ${IODBC_INCLUDE_DIRS})
- set_property(TARGET ODBC::ODBC APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${IODBC_INCLUDE_DIRS})
+ # Build iODBC
+
+ # Define byproducts
+ set(IODBC_BYPRODUCT "lib/libiodbc.a")
+
+ set(IODBC_BYPRODUCT_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/iodbc-install/")
+
+ # Build project
+ ExternalProject_Add(
+ iodbc-external
+ URL "https://github.com/openlink/iODBC/archive/v3.52.14.tar.gz"
+ URL_HASH "SHA256=896d7e16b283cf9a6f5b5f46e8e9549aef21a11935726b0170987cd4c59d16db"
+ BUILD_IN_SOURCE true
+ SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/iodbc-src"
+ BUILD_COMMAND make
+ CMAKE_COMMAND ""
+ UPDATE_COMMAND ""
+ INSTALL_COMMAND make install
+ CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=${IODBC_BYPRODUCT_DIR} --with-pic
+ STEP_TARGETS build
+ BUILD_BYPRODUCTS "${IODBC_BYPRODUCT_DIR}/${IODBC_BYPRODUCT}"
+ EXCLUDE_FROM_ALL TRUE
+ )
+
+ # Set variables
+ set(IODBC_FOUND "YES" CACHE STRING "" FORCE)
+ set(IODBC_INCLUDE_DIRS "${IODBC_BYPRODUCT_DIR}/include" CACHE STRING "" FORCE)
+ set(IODBC_LIBRARIES "${IODBC_BYPRODUCT_DIR}/${IODBC_BYPRODUCT}" CACHE STRING "" FORCE)
+
+ # Set exported variables for FindPackage.cmake
+ set(EXPORTED_IODBC_INCLUDE_DIRS "${IODBC_INCLUDE_DIRS}" CACHE STRING "" FORCE)
+ set(EXPORTED_IODBC_LIBRARIES "${IODBC_LIBRARIES}" CACHE STRING "" FORCE)
+
+ # Create imported targets
+ add_library(ODBC::ODBC STATIC IMPORTED)
+ set_target_properties(ODBC::ODBC PROPERTIES IMPORTED_LOCATION "${IODBC_LIBRARIES}")
+ add_dependencies(ODBC::ODBC iodbc-external)
+ file(MAKE_DIRECTORY ${IODBC_INCLUDE_DIRS})
+ set_property(TARGET ODBC::ODBC APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${IODBC_INCLUDE_DIRS})
endif()
# Build SOCI
@@ -80,71 +80,71 @@ endif()
# This should be based on GNUInstallDirs, but it's done wrong in Soci:
# https://github.com/SOCI/soci/blob/release/4.0/CMakeLists.txt#L140
if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(LIBDIR "lib")
+ set(LIBDIR "lib")
else()
- set(LIBDIR "lib64")
+ set(LIBDIR "lib64")
endif()
if (WIN32)
- set(BYPRODUCT_SUFFIX "_4_0.lib")
+ set(BYPRODUCT_SUFFIX "_4_0.lib")
else()
- set(BYPRODUCT_SUFFIX ".a")
+ set(BYPRODUCT_SUFFIX ".a")
endif()
set(SOCI_BYPRODUCTS
- "${LIBDIR}/libsoci_core${BYPRODUCT_SUFFIX}"
- "${LIBDIR}/libsoci_odbc${BYPRODUCT_SUFFIX}"
- )
+ "${LIBDIR}/libsoci_core${BYPRODUCT_SUFFIX}"
+ "${LIBDIR}/libsoci_odbc${BYPRODUCT_SUFFIX}"
+ )
set(SOCI_BYPRODUCT_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/soci-install")
foreach(SOCI_BYPRODUCT ${SOCI_BYPRODUCTS})
- list(APPEND SOCI_LIBRARIES_LIST "${SOCI_BYPRODUCT_DIR}/${SOCI_BYPRODUCT}")
+ list(APPEND SOCI_LIBRARIES_LIST "${SOCI_BYPRODUCT_DIR}/${SOCI_BYPRODUCT}")
endforeach(SOCI_BYPRODUCT)
if(WIN32)
- # Set build options
- set(SOCI_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
- "-DCMAKE_INSTALL_PREFIX=${SOCI_BYPRODUCT_DIR}"
- "-DSOCI_TESTS=OFF"
- "-DSOCI_SHARED=OFF"
- "-DSOCI_CXX_C11=ON"
- "-DWITH_ODBC=ON"
- "-DWITH_BOOST=OFF")
+ # Set build options
+ set(SOCI_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
+ "-DCMAKE_INSTALL_PREFIX=${SOCI_BYPRODUCT_DIR}"
+ "-DSOCI_TESTS=OFF"
+ "-DSOCI_SHARED=OFF"
+ "-DSOCI_CXX_C11=ON"
+ "-DWITH_ODBC=ON"
+ "-DWITH_BOOST=OFF")
else()
- # SOCI has its own FindODBC.cmake file
- # Set build options
- set(SOCI_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
- "-DCMAKE_INSTALL_PREFIX=${SOCI_BYPRODUCT_DIR}"
- "-DSOCI_TESTS=OFF"
- "-DSOCI_SHARED=OFF"
- "-DSOCI_CXX_C11=ON"
- "-DSOCI_ODBC=ON"
- "-DODBC_INCLUDE_DIR=${IODBC_INCLUDE_DIRS}"
- "-DODBC_LIBRARY=${IODBC_LIBRARIES}"
- "-DWITH_BOOST=OFF")
+ # SOCI has its own FindODBC.cmake file
+ # Set build options
+ set(SOCI_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
+ "-DCMAKE_INSTALL_PREFIX=${SOCI_BYPRODUCT_DIR}"
+ "-DSOCI_TESTS=OFF"
+ "-DSOCI_SHARED=OFF"
+ "-DSOCI_CXX_C11=ON"
+ "-DSOCI_ODBC=ON"
+ "-DODBC_INCLUDE_DIR=${IODBC_INCLUDE_DIRS}"
+ "-DODBC_LIBRARY=${IODBC_LIBRARIES}"
+ "-DWITH_BOOST=OFF")
endif()
if(NOT WIN32)
- list(APPEND SOCI_CMAKE_ARGS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/cmake/"
- "-DEXPORTED_IODBC_INCLUDE_DIRS=${EXPORTED_IODBC_INCLUDE_DIRS}"
- "-DEXPORTED_IODBC_LIBRARIES=${EXPORTED_IODBC_LIBRARIES}")
+ list(APPEND SOCI_CMAKE_ARGS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/cmake/"
+ "-DEXPORTED_IODBC_INCLUDE_DIRS=${EXPORTED_IODBC_INCLUDE_DIRS}"
+ "-DEXPORTED_IODBC_LIBRARIES=${EXPORTED_IODBC_LIBRARIES}")
endif()
# Build project
ExternalProject_Add(
- soci-external
- URL "https://github.com/SOCI/soci/archive/4.0.1.tar.gz"
- URL_HASH "SHA256=fa69347b1a1ef74450c0382b665a67bd6777cc7005bbe09726479625bcf1e29c"
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/soci-src"
- CMAKE_ARGS ${SOCI_CMAKE_ARGS}
- BUILD_BYPRODUCTS ${SOCI_LIBRARIES_LIST}
- EXCLUDE_FROM_ALL TRUE
+ soci-external
+ URL "https://github.com/SOCI/soci/archive/4.0.1.tar.gz"
+ URL_HASH "SHA256=fa69347b1a1ef74450c0382b665a67bd6777cc7005bbe09726479625bcf1e29c"
+ SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/soci-src"
+ CMAKE_ARGS ${SOCI_CMAKE_ARGS}
+ BUILD_BYPRODUCTS ${SOCI_LIBRARIES_LIST}
+ EXCLUDE_FROM_ALL TRUE
)
# Set dependencies
if(NOT WIN32)
- add_dependencies(soci-external ODBC::ODBC)
+ add_dependencies(soci-external ODBC::ODBC)
endif()
# Set variables
diff --git a/extensions/standard-processors/CMakeLists.txt b/extensions/standard-processors/CMakeLists.txt
index b0dfb6048..db679c286 100644
--- a/extensions/standard-processors/CMakeLists.txt
+++ b/extensions/standard-processors/CMakeLists.txt
@@ -30,5 +30,4 @@ target_link_libraries(minifi-standard-processors ${LIBMINIFI} Threads::Threads r
register_extension(minifi-standard-processors "STANDARD PROCESSORS" STANDARD-PROCESSORS "Provides standard processors" "extensions/standard-processors/tests/")
-
register_extension_linter(minifi-standard-processors-linter)
diff --git a/extensions/standard-processors/tests/CMakeLists.txt b/extensions/standard-processors/tests/CMakeLists.txt
index d0ffa6dc3..af5cf41d0 100644
--- a/extensions/standard-processors/tests/CMakeLists.txt
+++ b/extensions/standard-processors/tests/CMakeLists.txt
@@ -21,32 +21,32 @@
file(GLOB PROCESSOR_UNIT_TESTS "unit/*.cpp")
file(GLOB PROCESSOR_INTEGRATION_TESTS "integration/*.cpp")
if(OPENSSL_OFF)
- list(REMOVE_ITEM PROCESSOR_INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/integration/SecureSocketGetTCPTest.cpp")
- list(REMOVE_ITEM PROCESSOR_INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/integration/TLSServerSocketSupportedProtocolsTest.cpp")
- list(REMOVE_ITEM PROCESSOR_INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/integration/TLSClientSocketSupportedProtocolsTest.cpp")
+ list(REMOVE_ITEM PROCESSOR_INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/integration/SecureSocketGetTCPTest.cpp")
+ list(REMOVE_ITEM PROCESSOR_INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/integration/TLSServerSocketSupportedProtocolsTest.cpp")
+ list(REMOVE_ITEM PROCESSOR_INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/integration/TLSClientSocketSupportedProtocolsTest.cpp")
endif()
SET(PROCESSOR_INT_TEST_COUNT 0)
FOREACH(testfile ${PROCESSOR_UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE ${PROCESSOR_INCLUDE_DIRS})
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE "../processors")
- target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE ${PROCESSOR_INCLUDE_DIRS})
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
createTests("${testfilename}")
target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-expression-language-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} minifi-civet-extensions)
- if (NOT DISABLE_ROCKSDB)
- target_link_libraries(${testfilename} minifi-rocksdb-repos)
- endif()
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
- MATH(EXPR PROCESSOR_INT_TEST_COUNT "${PROCESSOR_INT_TEST_COUNT}+1")
+ target_link_libraries(${testfilename} minifi-expression-language-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-civet-extensions)
+ if (NOT DISABLE_ROCKSDB)
+ target_link_libraries(${testfilename} minifi-rocksdb-repos)
+ endif()
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ MATH(EXPR PROCESSOR_INT_TEST_COUNT "${PROCESSOR_INT_TEST_COUNT}+1")
ENDFOREACH()
message("-- Finished building ${PROCESSOR_INT_TEST_COUNT} processor unit test file(s)...")
@@ -54,23 +54,23 @@ message("-- Finished building ${PROCESSOR_INT_TEST_COUNT} processor unit test fi
SET(INT_TEST_COUNT 0)
FOREACH(testfile ${PROCESSOR_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE ${PROCESSOR_INCLUDE_DIRS})
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE "../processors")
- target_include_directories(${testfilename} BEFORE PRIVATE ./include)
- createTests("${testfilename}")
- target_link_libraries(${testfilename})
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} minifi-civet-extensions)
- target_compile_definitions("${testfilename}" PRIVATE TZ_DATA_DIR="${CMAKE_BINARY_DIR}/tzdata")
- if (NOT DISABLE_ROCKSDB)
- target_link_libraries(${testfilename} minifi-rocksdb-repos)
- endif()
-
- MATH(EXPR INT_TEST_COUNT "${INT_TEST_COUNT}+1")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE ${PROCESSOR_INCLUDE_DIRS})
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename})
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-civet-extensions)
+ target_compile_definitions("${testfilename}" PRIVATE TZ_DATA_DIR="${CMAKE_BINARY_DIR}/tzdata")
+ if (NOT DISABLE_ROCKSDB)
+ target_link_libraries(${testfilename} minifi-rocksdb-repos)
+ endif()
+
+ MATH(EXPR INT_TEST_COUNT "${INT_TEST_COUNT}+1")
ENDFOREACH()
message("-- Finished building ${INT_TEST_COUNT} integration test file(s)...")
@@ -78,13 +78,13 @@ message("-- Finished building ${INT_TEST_COUNT} integration test file(s)...")
add_test(NAME TestExecuteProcess COMMAND TestExecuteProcess )
if(NOT OPENSSL_OFF)
- add_test(NAME SecureSocketGetTCPTest COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecure.yml" "${TEST_RESOURCES}/")
- add_test(NAME SecureSocketGetTCPTestEmptyPass COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecureEmptyPass.yml" "${TEST_RESOURCES}/")
- add_test(NAME SecureSocketGetTCPTestWithPassword COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecureWithPass.yml" "${TEST_RESOURCES}/")
- add_test(NAME SecureSocketGetTCPTestWithPasswordFile COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecureWithFilePass.yml" "${TEST_RESOURCES}/")
+ add_test(NAME SecureSocketGetTCPTest COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecure.yml" "${TEST_RESOURCES}/")
+ add_test(NAME SecureSocketGetTCPTestEmptyPass COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecureEmptyPass.yml" "${TEST_RESOURCES}/")
+ add_test(NAME SecureSocketGetTCPTestWithPassword COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecureWithPass.yml" "${TEST_RESOURCES}/")
+ add_test(NAME SecureSocketGetTCPTestWithPasswordFile COMMAND SecureSocketGetTCPTest "${TEST_RESOURCES}/TestGetTCPSecureWithFilePass.yml" "${TEST_RESOURCES}/")
- add_test(NAME TLSServerSocketSupportedProtocolsTest COMMAND TLSServerSocketSupportedProtocolsTest "${TEST_RESOURCES}/")
- add_test(NAME TLSClientSocketSupportedProtocolsTest COMMAND TLSClientSocketSupportedProtocolsTest "${TEST_RESOURCES}/")
+ add_test(NAME TLSServerSocketSupportedProtocolsTest COMMAND TLSServerSocketSupportedProtocolsTest "${TEST_RESOURCES}/")
+ add_test(NAME TLSClientSocketSupportedProtocolsTest COMMAND TLSClientSocketSupportedProtocolsTest "${TEST_RESOURCES}/")
endif()
add_test(NAME TailFileTest COMMAND TailFileTest "${TEST_RESOURCES}/TestTailFile.yml" "${TEST_RESOURCES}/")
diff --git a/extensions/systemd/CMakeLists.txt b/extensions/systemd/CMakeLists.txt
index b47da1967..9c1356569 100644
--- a/extensions/systemd/CMakeLists.txt
+++ b/extensions/systemd/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT ENABLE_SYSTEMD)
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/tensorflow/CMakeLists.txt b/extensions/tensorflow/CMakeLists.txt
index 86fcd4ce4..1c455fc96 100644
--- a/extensions/tensorflow/CMakeLists.txt
+++ b/extensions/tensorflow/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT ENABLE_TENSORFLOW)
- return()
+ return()
endif()
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
diff --git a/extensions/test-processors/CMakeLists.txt b/extensions/test-processors/CMakeLists.txt
index 77c8785d8..844147bd2 100644
--- a/extensions/test-processors/CMakeLists.txt
+++ b/extensions/test-processors/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (SKIP_TESTS AND NOT ENABLE_TEST_PROCESSORS)
- return()
+ return()
endif()
include(../ExtensionHeader.txt)
diff --git a/extensions/windows-event-log/CMakeLists.txt b/extensions/windows-event-log/CMakeLists.txt
index e825849c2..e93cf42a5 100644
--- a/extensions/windows-event-log/CMakeLists.txt
+++ b/extensions/windows-event-log/CMakeLists.txt
@@ -18,7 +18,7 @@
#
if (NOT (WIN32 AND (ENABLE_ALL OR ENABLE_WEL)))
- return()
+ return()
endif()
include(BundledPugiXml)
diff --git a/extensions/windows-event-log/tests/CMakeLists.txt b/extensions/windows-event-log/tests/CMakeLists.txt
index 3f7201269..b9fe53737 100644
--- a/extensions/windows-event-log/tests/CMakeLists.txt
+++ b/extensions/windows-event-log/tests/CMakeLists.txt
@@ -19,27 +19,27 @@
set(WEL_INTEGRATION_TESTS "BookmarkTests.cpp" "ConsumeWindowsEventLogTests.cpp" "MetadataWalkerTests.cpp")
if (TEST_CUSTOM_WEL_PROVIDER)
- execute_process(COMMAND
- "${CMAKE_CURRENT_LIST_DIR}/custom-provider/generate-and-register.bat"
- "${CMAKE_CURRENT_LIST_DIR}/custom-provider"
- )
- list(APPEND WEL_INTEGRATION_TESTS "CWELCustomProviderTests.cpp")
+ execute_process(COMMAND
+ "${CMAKE_CURRENT_LIST_DIR}/custom-provider/generate-and-register.bat"
+ "${CMAKE_CURRENT_LIST_DIR}/custom-provider"
+ )
+ list(APPEND WEL_INTEGRATION_TESTS "CWELCustomProviderTests.cpp")
endif()
SET(WEL_TEST_COUNT 0)
FOREACH(testfile ${WEL_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/windows-event-log/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-wel)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries (${testfilename} ${LIBMINIFI} ${CATCH_MAIN_LIB})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/windows-event-log/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-wel)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries (${testfilename} ${LIBMINIFI} ${CATCH_MAIN_LIB})
- MATH(EXPR WEL_TEST_COUNT "${WEL_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ MATH(EXPR WEL_TEST_COUNT "${WEL_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
ENDFOREACH()
message("-- Finished building ${WEL_TEST_COUNT} WEL related test file(s)...")
diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt
index 9d2482ddc..ca4b68f7d 100644
--- a/libminifi/CMakeLists.txt
+++ b/libminifi/CMakeLists.txt
@@ -23,38 +23,38 @@ project(nifi-libcore-minifi VERSION 0.12.0)
set(PROJECT_NAME "nifi-libcore-minifi")
if (WIN32)
- add_definitions(-DWIN32_LEAN_AND_MEAN)
+ add_definitions(-DWIN32_LEAN_AND_MEAN)
endif()
if (IOS)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-abi-version=2 -fobjc-arc -std=gnu++2a -stdlib=libc++ -isysroot ${CMAKE_OSX_SYSROOT} -DIOS")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-abi-version=2 -fobjc-arc -isysroot ${CMAKE_OSX_SYSROOT} -DIOS")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-abi-version=2 -fobjc-arc -std=gnu++2a -stdlib=libc++ -isysroot ${CMAKE_OSX_SYSROOT} -DIOS")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-abi-version=2 -fobjc-arc -isysroot ${CMAKE_OSX_SYSROOT} -DIOS")
else ()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DYAML_SUPPORT")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DYAML_SUPPORT")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DYAML_SUPPORT")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DYAML_SUPPORT")
endif()
include(CppVersion)
set_cpp_version()
if (WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-reorder")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-reorder")
endif()
include_directories(include)
if(WIN32)
- include_directories(opsys/win)
- set(SOCKET_SOURCES "src/io/win/*.cpp")
+ include_directories(opsys/win)
+ set(SOCKET_SOURCES "src/io/win/*.cpp")
else()
- include_directories(opsys/posix)
- set(SOCKET_SOURCES "src/io/posix/*.cpp")
+ include_directories(opsys/posix)
+ set(SOCKET_SOURCES "src/io/posix/*.cpp")
endif()
if (NOT OPENSSL_OFF)
- set(TLS_SOURCES "src/utils/tls/*.cpp" "src/io/tls/*.cpp")
+ set(TLS_SOURCES "src/utils/tls/*.cpp" "src/io/tls/*.cpp")
endif()
file(GLOB SOURCES "src/agent/agent_docs.cpp" "src/properties/*.cpp" "src/utils/file/*.cpp" "src/sitetosite/*.cpp" "src/core/logging/*.cpp" "src/core/logging/internal/*.cpp" "src/core/state/*.cpp" "src/core/state/nodes/*.cpp" "src/c2/protocols/*.cpp" "src/c2/triggers/*.cpp" "src/c2/*.cpp" "src/io/*.cpp" ${SOCKET_SOURCES} ${TLS_SOURCES} "src/core/controller/*.cpp" "src/controllers/*.cpp" "src/controllers/keyvalue/*.cpp" "src/core/*.cpp" "src/core/repository/*.cpp" "src/core/yaml/*.cpp" " [...]
@@ -62,14 +62,14 @@ file(GLOB SOURCES "src/agent/agent_docs.cpp" "src/properties/*.cpp" "src/utils/f
list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/agent_version.cpp")
if(WIN32)
- include(FindMessageCompiler)
- find_package(MessageCompiler REQUIRED)
- add_custom_target(message-strings
- COMMAND "${CMAKE_MC_COMPILER}" -U "${CMAKE_CURRENT_SOURCE_DIR}/src/core/logging/WindowsMessageTextFile.mc" -h "${CMAKE_CURRENT_BINARY_DIR}/include/core/logging" -r "${CMAKE_CURRENT_BINARY_DIR}/src/core/logging"
- DEPENDS "src/core/logging/WindowsMessageTextFile.mc"
- BYPRODUCTS "include/core/logging/WindowsMessageTextFile.h" "src/core/logging/WindowsMessageTextFile.rc")
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/core/logging")
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/core/logging")
+ include(FindMessageCompiler)
+ find_package(MessageCompiler REQUIRED)
+ add_custom_target(message-strings
+ COMMAND "${CMAKE_MC_COMPILER}" -U "${CMAKE_CURRENT_SOURCE_DIR}/src/core/logging/WindowsMessageTextFile.mc" -h "${CMAKE_CURRENT_BINARY_DIR}/include/core/logging" -r "${CMAKE_CURRENT_BINARY_DIR}/src/core/logging"
+ DEPENDS "src/core/logging/WindowsMessageTextFile.mc"
+ BYPRODUCTS "include/core/logging/WindowsMessageTextFile.h" "src/core/logging/WindowsMessageTextFile.rc")
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/core/logging")
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/core/logging")
endif()
file(GLOB PROCESSOR_SOURCES "src/processors/*.cpp" )
@@ -78,35 +78,35 @@ file(GLOB PROCESSOR_SOURCES "src/processors/*.cpp" )
add_library(core-minifi SHARED ${SOURCES})
target_compile_definitions(core-minifi PRIVATE "LIBMINIFI=1")
if(WIN32)
- set_target_properties(core-minifi PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
- add_dependencies(core-minifi message-strings)
- target_include_directories(core-minifi PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include")
- set_target_properties(core-minifi PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ set_target_properties(core-minifi PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+ add_dependencies(core-minifi message-strings)
+ target_include_directories(core-minifi PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include")
+ set_target_properties(core-minifi PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
else()
- set_target_properties(core-minifi PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+ set_target_properties(core-minifi PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
endif()
include(RangeV3)
include(Asio)
list(APPEND LIBMINIFI_LIBRARIES yaml-cpp ZLIB::ZLIB concurrentqueue RapidJSON spdlog Threads::Threads gsl-lite libsodium range-v3 expected-lite date::date date::tz asio)
if(NOT WIN32)
- list(APPEND LIBMINIFI_LIBRARIES OSSP::libuuid++)
+ list(APPEND LIBMINIFI_LIBRARIES OSSP::libuuid++)
endif()
if (NOT OPENSSL_OFF)
- list(APPEND LIBMINIFI_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
+ list(APPEND LIBMINIFI_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
- list(APPEND LIBMINIFI_LIBRARIES stdc++fs)
+ list(APPEND LIBMINIFI_LIBRARIES stdc++fs)
endif()
target_link_libraries(core-minifi ${CMAKE_DL_LIBS} ${LIBMINIFI_LIBRARIES})
SET (LIBMINIFI core-minifi PARENT_SCOPE)
if (WIN32)
- install(TARGETS core-minifi ARCHIVE DESTINATION bin COMPONENT bin)
- install(TARGETS core-minifi RUNTIME DESTINATION bin COMPONENT bin)
+ install(TARGETS core-minifi ARCHIVE DESTINATION bin COMPONENT bin)
+ install(TARGETS core-minifi RUNTIME DESTINATION bin COMPONENT bin)
else()
- install(TARGETS core-minifi LIBRARY DESTINATION bin COMPONENT bin)
+ install(TARGETS core-minifi LIBRARY DESTINATION bin COMPONENT bin)
endif()
diff --git a/libminifi/cmake/FindRocksDB.cmake b/libminifi/cmake/FindRocksDB.cmake
index db9c2d15a..44338375e 100644
--- a/libminifi/cmake/FindRocksDB.cmake
+++ b/libminifi/cmake/FindRocksDB.cmake
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -46,6 +46,6 @@ mark_as_advanced(
)
if(ROCKSDB_INCLUDE_DIR AND ROCKSDB_LIBRARIES)
- set(ROCKSDB_FOUND "YES")
- message(STATUS "Found RocksDB...${ROCKSDB_LIBRARIES}")
-endif()
\ No newline at end of file
+ set(ROCKSDB_FOUND "YES")
+ message(STATUS "Found RocksDB...${ROCKSDB_LIBRARIES}")
+endif()
diff --git a/libminifi/cmake/iOS.cmake b/libminifi/cmake/iOS.cmake
index 87148f71a..87d9e4e4e 100644
--- a/libminifi/cmake/iOS.cmake
+++ b/libminifi/cmake/iOS.cmake
@@ -46,180 +46,180 @@
# Thanks to the android-cmake project for providing the command
# Standard settings
-set (CMAKE_SYSTEM_NAME Darwin)
-set (CMAKE_SYSTEM_VERSION 1)
-set (UNIX True)
-set (APPLE True)
-set (IOS True)
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_SYSTEM_VERSION 1)
+set(UNIX True)
+set(APPLE True)
+set(IOS True)
# Required as of cmake 2.8.10
-set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
+set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
# Determine the cmake host system version so we know where to find the iOS SDKs
-find_program (CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
-if (CMAKE_UNAME)
- exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
- string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
-endif (CMAKE_UNAME)
+find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
+if(CMAKE_UNAME)
+ exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
+ string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
+endif(CMAKE_UNAME)
# Force the compilers to gcc for iOS
-include (CMakeForceCompiler)
+include(CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER (/usr/bin/gcc Apple)
CMAKE_FORCE_CXX_COMPILER (/usr/bin/g++ Apple)
set(CMAKE_AR ar CACHE FILEPATH "" FORCE)
# Skip the platform compiler checks for cross compiling
-set (CMAKE_CXX_COMPILER_WORKS TRUE)
-set (CMAKE_C_COMPILER_WORKS TRUE)
+set(CMAKE_CXX_COMPILER_WORKS TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)
# All iOS/Darwin specific settings - some may be redundant
-set (CMAKE_SHARED_LIBRARY_PREFIX "lib")
-set (CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
-set (CMAKE_SHARED_MODULE_PREFIX "lib")
-set (CMAKE_SHARED_MODULE_SUFFIX ".so")
-set (CMAKE_MODULE_EXISTS 1)
-set (CMAKE_DL_LIBS "")
-
-set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
-set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
-set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
-set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
-
-# Hidden visibilty is required for cxx on iOS
-set (CMAKE_C_FLAGS_INIT "")
-set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden")
-
-set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
-set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
-
-set (CMAKE_PLATFORM_HAS_INSTALLNAME 1)
-set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
-set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
-set (CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
-set (CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
-set (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+set(CMAKE_SHARED_MODULE_PREFIX "lib")
+set(CMAKE_SHARED_MODULE_SUFFIX ".so")
+set(CMAKE_MODULE_EXISTS 1)
+set(CMAKE_DL_LIBS "")
+
+set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
+set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
+set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
+
+# Hidden visibilty is required for cxx on iOS
+set(CMAKE_C_FLAGS_INIT "")
+set(CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden")
+
+set(CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
+set(CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
+
+set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
+set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
-if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
- find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
-endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+if(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+ find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+endif(NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
# Setup iOS platform unless specified manually with IOS_PLATFORM
-if (NOT DEFINED IOS_PLATFORM)
- set (IOS_PLATFORM "OS")
-endif (NOT DEFINED IOS_PLATFORM)
-set (IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform")
+if(NOT DEFINED IOS_PLATFORM)
+ set(IOS_PLATFORM "OS")
+endif(NOT DEFINED IOS_PLATFORM)
+set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform")
# Setup building for arm64 or not
-if (NOT DEFINED BUILD_ARM64)
- set (BUILD_ARM64 true)
-endif (NOT DEFINED BUILD_ARM64)
-set (BUILD_ARM64 ${BUILD_ARM64} CACHE STRING "Build arm64 arch or not")
+if(NOT DEFINED BUILD_ARM64)
+ set(BUILD_ARM64 true)
+endif(NOT DEFINED BUILD_ARM64)
+set(BUILD_ARM64 ${BUILD_ARM64} CACHE STRING "Build arm64 arch or not")
# Check the platform selection and setup for developer root
-if (${IOS_PLATFORM} STREQUAL "OS")
- set (IOS_PLATFORM_LOCATION "iPhoneOS.platform")
-
- # This causes the installers to properly locate the output libraries
- set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR")
- set (SIMULATOR true)
- set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
-
- # This causes the installers to properly locate the output libraries
- set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR64")
- set (SIMULATOR true)
- set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
-
- # This causes the installers to properly locate the output libraries
- set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
-else (${IOS_PLATFORM} STREQUAL "OS")
- message (FATAL_ERROR "Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR")
-endif (${IOS_PLATFORM} STREQUAL "OS")
+if(${IOS_PLATFORM} STREQUAL "OS")
+ set(IOS_PLATFORM_LOCATION "iPhoneOS.platform")
+
+ # This causes the installers to properly locate the output libraries
+ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR")
+ set(SIMULATOR true)
+ set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
+
+ # This causes the installers to properly locate the output libraries
+ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR64")
+ set(SIMULATOR true)
+ set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
+
+ # This causes the installers to properly locate the output libraries
+ set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+else(${IOS_PLATFORM} STREQUAL "OS")
+ message(FATAL_ERROR "Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR")
+endif(${IOS_PLATFORM} STREQUAL "OS")
# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT
# Note Xcode 4.3 changed the installation location, choose the most recent one available
exec_program(/usr/bin/xcode-select ARGS -print-path OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR)
-set (XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
-set (XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
-if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
- if (EXISTS ${XCODE_POST_43_ROOT})
- set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT})
- elseif(EXISTS ${XCODE_PRE_43_ROOT})
- set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT})
- endif (EXISTS ${XCODE_POST_43_ROOT})
-endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
-set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")
+set(XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+set(XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+if(NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
+ if(EXISTS ${XCODE_POST_43_ROOT})
+ set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT})
+ elseif(EXISTS ${XCODE_PRE_43_ROOT})
+ set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT})
+ endif(EXISTS ${XCODE_POST_43_ROOT})
+endif(NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
+set(CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")
# Find and use the most recent iOS sdk unless specified manually with CMAKE_IOS_SDK_ROOT
-if (NOT DEFINED CMAKE_IOS_SDK_ROOT)
- file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
- if (_CMAKE_IOS_SDKS)
- list (SORT _CMAKE_IOS_SDKS)
- list (REVERSE _CMAKE_IOS_SDKS)
- list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
- else (_CMAKE_IOS_SDKS)
- message (FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.")
- endif (_CMAKE_IOS_SDKS)
- message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
-endif (NOT DEFINED CMAKE_IOS_SDK_ROOT)
-set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK")
+if(NOT DEFINED CMAKE_IOS_SDK_ROOT)
+ file(GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
+ if(_CMAKE_IOS_SDKS)
+ list(SORT _CMAKE_IOS_SDKS)
+ list(REVERSE _CMAKE_IOS_SDKS)
+ list(GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
+ else(_CMAKE_IOS_SDKS)
+ message(FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.")
+ endif(_CMAKE_IOS_SDKS)
+ message(STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
+endif(NOT DEFINED CMAKE_IOS_SDK_ROOT)
+set(CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK")
# Set the sysroot default to the most recent SDK
-set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")
+set(CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")
-# set the architecture for iOS
-if (${IOS_PLATFORM} STREQUAL "OS")
- set (IOS_ARCH armv7 armv7s arm64)
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR")
- set (IOS_ARCH i386)
-elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR64")
- set (IOS_ARCH x86_64)
-endif (${IOS_PLATFORM} STREQUAL "OS")
+# set the architecture for iOS
+if(${IOS_PLATFORM} STREQUAL "OS")
+ set(IOS_ARCH armv7 armv7s arm64)
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR")
+ set(IOS_ARCH i386)
+elseif(${IOS_PLATFORM} STREQUAL "SIMULATOR64")
+ set(IOS_ARCH x86_64)
+endif(${IOS_PLATFORM} STREQUAL "OS")
-set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string "Build architecture for iOS")
+set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE string "Build architecture for iOS")
# Set the find root to the iOS developer roots and to user defined paths
-set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root")
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE string "iOS find search path root")
# default to searching for frameworks first
-set (CMAKE_FIND_FRAMEWORK FIRST)
+set(CMAKE_FIND_FRAMEWORK FIRST)
# set up the default search directories for frameworks
-set (CMAKE_SYSTEM_FRAMEWORK_PATH
- ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
- ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
- ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
+set(CMAKE_SYSTEM_FRAMEWORK_PATH
+ ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
+ ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
+ ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
)
# only search the iOS sdks, not the remainder of the host filesystem
-set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
-set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# This little macro lets you set any XCode specific property
-macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
- set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})
-endmacro (set_xcode_property)
+macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
+ set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})
+endmacro(set_xcode_property)
# This macro lets you find executable programs on the host system
-macro (find_host_package)
- set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
- set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
- set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
- set (IOS FALSE)
-
- find_package(${ARGN})
-
- set (IOS TRUE)
- set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
- set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
- set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endmacro (find_host_package)
+macro(find_host_package)
+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+ set(IOS FALSE)
+
+ find_package(${ARGN})
+
+ set(IOS TRUE)
+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endmacro(find_host_package)
diff --git a/libminifi/test/archive-tests/CMakeLists.txt b/libminifi/test/archive-tests/CMakeLists.txt
index ce655225f..88039891d 100644
--- a/libminifi/test/archive-tests/CMakeLists.txt
+++ b/libminifi/test/archive-tests/CMakeLists.txt
@@ -21,15 +21,15 @@ file(GLOB ARCHIVE_INTEGRATION_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${ARCHIVE_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}" "${TEST_DIR}/archive-tests/util/ArchiveTests.cpp")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/libarchive")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_link_libraries(${testfilename} minifi-archive-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}" "${TEST_DIR}/archive-tests/util/ArchiveTests.cpp")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/libarchive")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_link_libraries(${testfilename} minifi-archive-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${ARCHIVE-EXTENSIONS_TEST_COUNT} Lib Archive related test file(s)...")
diff --git a/libminifi/test/aws-tests/CMakeLists.txt b/libminifi/test/aws-tests/CMakeLists.txt
index 03fadfb03..288ad49d6 100644
--- a/libminifi/test/aws-tests/CMakeLists.txt
+++ b/libminifi/test/aws-tests/CMakeLists.txt
@@ -21,19 +21,19 @@ file(GLOB AWS_INTEGRATION_TESTS "*.cpp")
SET(AWS_TEST_COUNT 0)
FOREACH(testfile ${AWS_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/aws")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/aws/s3")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/aws/processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-aws)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} minifi-expression-language-extensions)
- MATH(EXPR AWS_TEST_COUNT "${AWS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/aws")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/aws/s3")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/aws/processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-aws)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-expression-language-extensions)
+ MATH(EXPR AWS_TEST_COUNT "${AWS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${AWS_TEST_COUNT} AWS related test file(s)...")
diff --git a/libminifi/test/azure-tests/CMakeLists.txt b/libminifi/test/azure-tests/CMakeLists.txt
index 2c3dd9365..2f8ad6ba4 100644
--- a/libminifi/test/azure-tests/CMakeLists.txt
+++ b/libminifi/test/azure-tests/CMakeLists.txt
@@ -21,19 +21,19 @@ file(GLOB AZURE_INTEGRATION_TESTS "*.cpp")
SET(AZURE_TEST_COUNT 0)
FOREACH(testfile ${AZURE_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/azure")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/azure/storage")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
- target_compile_features(${testfilename} PRIVATE cxx_std_14)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-azure)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} minifi-expression-language-extensions)
- MATH(EXPR AZURE_TEST_COUNT "${AZURE_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/azure")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/azure/storage")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/expression-language")
+ target_compile_features(${testfilename} PRIVATE cxx_std_14)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-azure)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-expression-language-extensions)
+ MATH(EXPR AZURE_TEST_COUNT "${AZURE_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${AZURE_TEST_COUNT} Azure related test file(s)...")
diff --git a/libminifi/test/bustache-tests/CMakeLists.txt b/libminifi/test/bustache-tests/CMakeLists.txt
index ba136649d..c89e2b887 100644
--- a/libminifi/test/bustache-tests/CMakeLists.txt
+++ b/libminifi/test/bustache-tests/CMakeLists.txt
@@ -20,18 +20,18 @@
file(GLOB BUSTACHE_INTEGRATION_TESTS "*.cpp")
SET(BUSTACHE-EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${BUSTACHE_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/bustache")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/bustache/include")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/bustache")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/bustache/include")
- target_link_libraries(${testfilename} minifi-bustache-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-bustache-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- MATH(EXPR BUSTACHE-EXTENSIONS_TEST_COUNT "${BUSTACHE-EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ MATH(EXPR BUSTACHE-EXTENSIONS_TEST_COUNT "${BUSTACHE-EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${BUSTACHE-EXTENSIONS_TEST_COUNT} Bustache related test file(s)...")
diff --git a/libminifi/test/coap-tests/CMakeLists.txt b/libminifi/test/coap-tests/CMakeLists.txt
index d7c5f5de2..13c588cd7 100644
--- a/libminifi/test/coap-tests/CMakeLists.txt
+++ b/libminifi/test/coap-tests/CMakeLists.txt
@@ -20,13 +20,13 @@
file(GLOB COAP_INTEGRATION_TESTS "*.cpp")
SET(COAP_TEST_COUNT 0)
FOREACH(testfile ${COAP_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/coap/")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-coap)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR COAP_TEST_COUNT "${COAP_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/coap/")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-coap)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR COAP_TEST_COUNT "${COAP_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${COAP_TEST_COUNT} COAP related test file(s)...")
diff --git a/libminifi/test/gps-tests/CMakeLists.txt b/libminifi/test/gps-tests/CMakeLists.txt
index 2e529fc3f..076cce392 100644
--- a/libminifi/test/gps-tests/CMakeLists.txt
+++ b/libminifi/test/gps-tests/CMakeLists.txt
@@ -20,15 +20,15 @@
file(GLOB GPS_INTEGRATION_TESTS "*.cpp")
SET(GPS_TEST_COUNT 0)
FOREACH(testfile ${GPS_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/gps/")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-gps)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- MATH(EXPR GPS_TEST_COUNT "${GPS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/gps/")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-gps)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ MATH(EXPR GPS_TEST_COUNT "${GPS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${GPS_TEST_COUNT} GPS related test file(s)...")
diff --git a/libminifi/test/jni-tests/CMakeLists.txt b/libminifi/test/jni-tests/CMakeLists.txt
index 982fb1551..653fcfadb 100644
--- a/libminifi/test/jni-tests/CMakeLists.txt
+++ b/libminifi/test/jni-tests/CMakeLists.txt
@@ -21,16 +21,16 @@ file(GLOB KAFKA_INTEGRATION_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${KAFKA_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/librdkafka")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src-cpp")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-jni)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/librdkafka")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src-cpp")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-jni)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${KAFKA-EXTENSIONS_TEST_COUNT} Lib Kafka related test file(s)...")
diff --git a/libminifi/test/mqtt-tests/CMakeLists.txt b/libminifi/test/mqtt-tests/CMakeLists.txt
index e19518d61..55e4437b1 100644
--- a/libminifi/test/mqtt-tests/CMakeLists.txt
+++ b/libminifi/test/mqtt-tests/CMakeLists.txt
@@ -21,16 +21,16 @@ file(GLOB KAFKA_INTEGRATION_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${KAFKA_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/librdkafka")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src-cpp")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-mqtt-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/librdkafka")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/thirdparty/librdkafka-0.11.1/src-cpp")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-mqtt-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${KAFKA-EXTENSIONS_TEST_COUNT} Lib Kafka related test file(s)...")
diff --git a/libminifi/test/pcap-tests/CMakeLists.txt b/libminifi/test/pcap-tests/CMakeLists.txt
index e758971de..a307c4ed1 100644
--- a/libminifi/test/pcap-tests/CMakeLists.txt
+++ b/libminifi/test/pcap-tests/CMakeLists.txt
@@ -22,19 +22,19 @@ file(GLOB PCAP_TESTS "*.cpp")
SET(PCAP_INT_TEST_COUNT 0)
FOREACH(testfile ${PCAP_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}" )
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/pcap/")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_BINARY_DIR}/extensions/pcap/pcap++/Dist/header/")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}" )
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/pcap/")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_BINARY_DIR}/extensions/pcap/pcap++/Dist/header/")
createTests("${testfilename}")
target_link_libraries(${testfilename} minifi-pcap)
target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR PCAP_INT_TEST_COUNT "${PCAP_INT_TEST_COUNT}+1")
+ MATH(EXPR PCAP_INT_TEST_COUNT "${PCAP_INT_TEST_COUNT}+1")
ENDFOREACH()
message("-- Finished building ${PCAP_INT_TEST_COUNT} libPCAP test file(s)...")
-if(APPLE)
+if(APPLE)
add_test(NAME PcapTest COMMAND PcapTest "${TEST_RESOURCES}/TestPcap.yml" "${TEST_RESOURCES}/")
else()
add_test(NAME PcapTest COMMAND PcapTest "${TEST_RESOURCES}/TestPcapLinux.yml" "${TEST_RESOURCES}/")
diff --git a/libminifi/test/persistence-tests/CMakeLists.txt b/libminifi/test/persistence-tests/CMakeLists.txt
index 52643a61e..de2b73439 100644
--- a/libminifi/test/persistence-tests/CMakeLists.txt
+++ b/libminifi/test/persistence-tests/CMakeLists.txt
@@ -22,18 +22,18 @@ include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
file(GLOB PERSISTENCE_TESTS "*.cpp")
SET(PERSISTENCE_TEST_COUNT 0)
FOREACH(testfile ${PERSISTENCE_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/libarchive")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/rocksdb-repos/")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${ROCKSDB_THIRDPARTY_ROOT}/include")
- target_link_libraries(${testfilename} minifi-archive-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} minifi-rocksdb-repos)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- MATH(EXPR PERSISTENCE_TEST_COUNT "${PERSISTENCE_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/libarchive")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/rocksdb-repos/")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${ROCKSDB_THIRDPARTY_ROOT}/include")
+ target_link_libraries(${testfilename} minifi-archive-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-rocksdb-repos)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ MATH(EXPR PERSISTENCE_TEST_COUNT "${PERSISTENCE_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${ARCHIVE-PERSISTENCE_TEST_COUNT} Persistence related test file(s)...")
diff --git a/libminifi/test/rocksdb-tests/CMakeLists.txt b/libminifi/test/rocksdb-tests/CMakeLists.txt
index 16961465e..0ab38c284 100644
--- a/libminifi/test/rocksdb-tests/CMakeLists.txt
+++ b/libminifi/test/rocksdb-tests/CMakeLists.txt
@@ -20,15 +20,15 @@
file(GLOB ROCKSDB_UNIT_TESTS "*.cpp")
SET(ROCKSDB_TEST_COUNT 0)
FOREACH(testfile ${ROCKSDB_UNIT_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/rocksdb-repos/")
- target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${ROCKSDB_THIRDPARTY_ROOT}/include")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- target_link_libraries(${testfilename} minifi-rocksdb-repos)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR ROCKSDB_TEST_COUNT "${ROCKSDB_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/rocksdb-repos/")
+ target_include_directories(${testfilename} SYSTEM BEFORE PRIVATE "${ROCKSDB_THIRDPARTY_ROOT}/include")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ target_link_libraries(${testfilename} minifi-rocksdb-repos)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR ROCKSDB_TEST_COUNT "${ROCKSDB_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${ROCKSDB_TEST_COUNT} RocksDB related test file(s)...")
diff --git a/libminifi/test/sensors-tests/CMakeLists.txt b/libminifi/test/sensors-tests/CMakeLists.txt
index 10865a23f..0cbff8f8b 100644
--- a/libminifi/test/sensors-tests/CMakeLists.txt
+++ b/libminifi/test/sensors-tests/CMakeLists.txt
@@ -22,15 +22,15 @@ file(GLOB SENSORS_TESTS "*.cpp")
SET(SENSORS_INT_TEST_COUNT 0)
FOREACH(testfile ${SENSORS_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}" )
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/RTIMULib/RTIMULib/")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/sensors/")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_BINARY_DIR}/extensions/sensors/")
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}" )
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/RTIMULib/RTIMULib/")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/sensors/")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_BINARY_DIR}/extensions/sensors/")
createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-sensors)
- target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} minifi-sensors)
+ target_link_libraries(${testfilename} minifi-standard-processors)
MATH(EXPR SENSORS_INT_TEST_COUNT "${SENSORS_INT_TEST_COUNT}+1")
ENDFOREACH()
diff --git a/libminifi/test/tensorflow-tests/CMakeLists.txt b/libminifi/test/tensorflow-tests/CMakeLists.txt
index 6c5b678e2..7056acbd0 100644
--- a/libminifi/test/tensorflow-tests/CMakeLists.txt
+++ b/libminifi/test/tensorflow-tests/CMakeLists.txt
@@ -23,16 +23,16 @@ file(GLOB TENSORFLOW_INTEGRATION_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${TENSORFLOW_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}" "${TEST_DIR}/TestBase.cpp")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/tensorflow")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE ${TENSORFLOW_INCLUDE_DIRS})
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-tensorflow-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}" "${TEST_DIR}/TestBase.cpp")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/tensorflow")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE ${TENSORFLOW_INCLUDE_DIRS})
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-tensorflow-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${TENSORFLOW-EXTENSIONS_TEST_COUNT} TensorFlow related test file(s)...")
diff --git a/libminifi/test/usb-camera-tests/CMakeLists.txt b/libminifi/test/usb-camera-tests/CMakeLists.txt
index a28c5d09f..27c40b676 100644
--- a/libminifi/test/usb-camera-tests/CMakeLists.txt
+++ b/libminifi/test/usb-camera-tests/CMakeLists.txt
@@ -21,14 +21,14 @@ file(GLOB USB_CAMERA_INTEGRATION_TESTS "*.cpp")
SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${USB_CAMERA_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}" "${TEST_DIR}/TestBase.cpp")
- target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/usb-camera")
- target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/libuvc-0.0.6/include")
- createTests("${testfilename}")
- target_link_libraries(${testfilename} minifi-usb-camera-extensions)
- target_link_libraries(${testfilename} minifi-standard-processors)
- MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}" "${TEST_DIR}/TestBase.cpp")
+ target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/usb-camera")
+ target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/thirdparty/libuvc-0.0.6/include")
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} minifi-usb-camera-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
message("-- Finished building ${USB_CAMERA-EXTENSIONS_TEST_COUNT} Lib Archive related test file(s)...")
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 6d27ca681..ebde70042 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -22,10 +22,10 @@ cmake_minimum_required(VERSION 3.16)
include_directories(../libminifi/include)
if(WIN32)
- add_definitions(-DWIN32_LEAN_AND_MEAN)
- include_directories(../libminifi/opsys/win)
+ add_definitions(-DWIN32_LEAN_AND_MEAN)
+ include_directories(../libminifi/opsys/win)
else()
- include_directories(../libminifi/opsys/posix)
+ include_directories(../libminifi/opsys/posix)
endif()
@@ -34,26 +34,26 @@ set_cpp_version()
set(MINIFIEXE_SOURCES MiNiFiMain.cpp MainHelper.cpp MiNiFiWindowsService.cpp AgentDocs.cpp)
if(WIN32)
- set_source_files_properties("${CMAKE_BINARY_DIR}/libminifi/src/core/logging/WindowsMessageTextFile.rc" PROPERTIES GENERATED TRUE)
- list(APPEND MINIFIEXE_SOURCES "${CMAKE_BINARY_DIR}/libminifi/src/core/logging/WindowsMessageTextFile.rc")
+ set_source_files_properties("${CMAKE_BINARY_DIR}/libminifi/src/core/logging/WindowsMessageTextFile.rc" PROPERTIES GENERATED TRUE)
+ list(APPEND MINIFIEXE_SOURCES "${CMAKE_BINARY_DIR}/libminifi/src/core/logging/WindowsMessageTextFile.rc")
endif()
add_executable(minifiexe ${MINIFIEXE_SOURCES})
if (NOT USE_SHARED_LIBS)
- if (LIBC_STATIC)
- set_target_properties(minifiexe PROPERTIES LINK_SEARCH_START_STATIC 1)
- endif(LIBC_STATIC)
+ if (LIBC_STATIC)
+ set_target_properties(minifiexe PROPERTIES LINK_SEARCH_START_STATIC 1)
+ endif(LIBC_STATIC)
endif(NOT USE_SHARED_LIBS)
target_link_libraries(minifiexe Threads::Threads)
target_link_libraries(minifiexe yaml-cpp)
if(NOT WIN32 AND ENABLE_JNI AND NOT DISABLE_JEMALLOC)
- target_link_libraries(minifiexe JeMalloc::JeMalloc)
+ target_link_libraries(minifiexe JeMalloc::JeMalloc)
endif()
if (WIN32)
- include_directories(SYSTEM "../thirdparty/Simple-Windows-Posix-Semaphore")
- target_link_libraries(minifiexe semaphore)
+ include_directories(SYSTEM "../thirdparty/Simple-Windows-Posix-Semaphore")
+ target_link_libraries(minifiexe semaphore)
endif()
get_property(extensions GLOBAL PROPERTY EXTENSION-OPTIONS)
@@ -65,16 +65,16 @@ set_target_properties(minifiexe PROPERTIES ENABLE_EXPORTS True)
if (NOT WIN32)
add_custom_command(TARGET minifiexe POST_BUILD
- COMMAND cat ${CMAKE_BINARY_DIR}/all.log)
+ COMMAND cat ${CMAKE_BINARY_DIR}/all.log)
else()
#add_custom_command(TARGET minifiexe POST_BUILD
# COMMAND type ${CMAKE_BINARY_DIR}/all.log)
endif()
if (NOT WIN32)
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- target_link_options(minifiexe PRIVATE "-Wl,--disable-new-dtags")
- endif()
- set_target_properties(minifiexe PROPERTIES INSTALL_RPATH "$ORIGIN")
- install(TARGETS minifiexe RUNTIME DESTINATION bin COMPONENT bin)
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+ target_link_options(minifiexe PRIVATE "-Wl,--disable-new-dtags")
+ endif()
+ set_target_properties(minifiexe PROPERTIES INSTALL_RPATH "$ORIGIN")
+ install(TARGETS minifiexe RUNTIME DESTINATION bin COMPONENT bin)
endif()
diff --git a/nanofi/CMakeLists.txt b/nanofi/CMakeLists.txt
index 129c59535..e302b89ad 100644
--- a/nanofi/CMakeLists.txt
+++ b/nanofi/CMakeLists.txt
@@ -24,15 +24,15 @@ include_directories(include)
include_directories(../libminifi/include)
if(WIN32)
-include_directories(../libminifi/opsys/win)
+ include_directories(../libminifi/opsys/win)
else()
-include_directories(../libminifi/opsys/posix)
+ include_directories(../libminifi/opsys/posix)
endif()
file(GLOB NANOFI_SOURCES "src/api/*.c*" "src/core/*.c*" "src/cxx/*.cpp" "src/sitetosite/*.c*")
if(WIN32)
-list(REMOVE_ITEM NANOFI_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/api/ecu.c ${CMAKE_CURRENT_SOURCE_DIR}/src/core/file_utils.c ${CMAKE_CURRENT_SOURCE_DIR}/src/core/flowfiles.c)
+ list(REMOVE_ITEM NANOFI_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/api/ecu.c ${CMAKE_CURRENT_SOURCE_DIR}/src/core/file_utils.c ${CMAKE_CURRENT_SOURCE_DIR}/src/core/flowfiles.c)
endif()
file(GLOB NANOFI_ECU_SOURCES "ecu/*.c")
@@ -45,6 +45,6 @@ add_library(nanofi STATIC ${NANOFI_SOURCES})
target_link_libraries(nanofi spdlog ut core-minifi minifi-standard-processors)
if (NOT DISABLE_CURL)
-add_subdirectory(examples)
-add_subdirectory(ecu)
+ add_subdirectory(examples)
+ add_subdirectory(ecu)
endif()
diff --git a/nanofi/ecu/CMakeLists.txt b/nanofi/ecu/CMakeLists.txt
index 9c11199eb..8973fae5f 100644
--- a/nanofi/ecu/CMakeLists.txt
+++ b/nanofi/ecu/CMakeLists.txt
@@ -19,17 +19,16 @@
cmake_minimum_required(VERSION 3.16)
-
if (NOT WIN32)
-add_executable(log_aggregator log_aggregator.c)
-target_link_libraries(log_aggregator nanofi Threads::Threads)
-target_link_libraries(log_aggregator minifi-http-curl)
+ add_executable(log_aggregator log_aggregator.c)
+ target_link_libraries(log_aggregator nanofi Threads::Threads)
+ target_link_libraries(log_aggregator minifi-http-curl)
-add_executable(tailfile_chunk tailfile_chunk.c)
-target_link_libraries(tailfile_chunk nanofi Threads::Threads)
-target_link_libraries(tailfile_chunk minifi-http-curl)
+ add_executable(tailfile_chunk tailfile_chunk.c)
+ target_link_libraries(tailfile_chunk nanofi Threads::Threads)
+ target_link_libraries(tailfile_chunk minifi-http-curl)
-add_executable(tailfile_delimited tailfile_delimited.c)
-target_link_libraries(tailfile_delimited nanofi Threads::Threads)
-target_link_libraries(tailfile_delimited minifi-http-curl)
+ add_executable(tailfile_delimited tailfile_delimited.c)
+ target_link_libraries(tailfile_delimited nanofi Threads::Threads)
+ target_link_libraries(tailfile_delimited minifi-http-curl)
endif()
diff --git a/python/library/CMakeLists.txt b/python/library/CMakeLists.txt
index 6de2a0907..07400eb14 100644
--- a/python/library/CMakeLists.txt
+++ b/python/library/CMakeLists.txt
@@ -20,15 +20,15 @@
cmake_minimum_required(VERSION 3.16)
IF(POLICY CMP0048)
- CMAKE_POLICY(SET CMP0048 OLD)
+ CMAKE_POLICY(SET CMP0048 OLD)
ENDIF(POLICY CMP0048)
include_directories(SYSTEM ../../thirdparty/)
include_directories(../../nanofi/include/ ../../libminifi/include ../../libminifi/include/c2 ../../libminifi/include/c2/protocols/ ../../libminifi/include/core/state ./libminifi/include/core/statemanagement/metrics ../../libminifi/include/core/yaml ../../libminifi/include/core ../../thirdparty/)
if(WIN32)
- include_directories(../../libminifi/opsys/win)
+ include_directories(../../libminifi/opsys/win)
else()
- include_directories(../../libminifi/opsys/posix)
+ include_directories(../../libminifi/opsys/posix)
endif()
include_directories(../../extensions/http-curl/ ../../extensions/http-curl/client ../../extensions/http-curl/sitetosite ../../extensions/http-curl/protocols ../../extensions/http-curl/processors)