Skip to content

Commit

Permalink
Fix windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdebreceni committed Oct 14, 2024
1 parent e44de21 commit cf9189c
Show file tree
Hide file tree
Showing 25 changed files with 8 additions and 814 deletions.
7 changes: 2 additions & 5 deletions extension-utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,18 @@ file(GLOB SOURCES
src/controllers/*.cpp
src/io/*.cpp
src/serialization/*.cpp
src/utils/crypto/ciphers/*.cpp
src/utils/property_encryption/*.cpp
src/utils/crypto/*.cpp
src/utils/file/*.cpp
src/utils/net/*.cpp
src/utils/tls/*.cpp
src/utils/*.cpp)
add_library(minifi-extension-utils STATIC ${SOURCES})
add_minifi_library(minifi-extension-utils STATIC ${SOURCES})
target_include_directories(minifi-extension-utils PUBLIC include)
target_link_libraries(minifi-extension-utils PUBLIC minifi-core)

include(RangeV3)
include(Asio)
include(MagicEnum)
list(APPEND CORE_LIBRARIES ZLIB::ZLIB concurrentqueue RapidJSON spdlog Threads::Threads gsl-lite libsodium range-v3 expected-lite date::date date::tz asio magic_enum OpenSSL::Crypto OpenSSL::SSL CURL::libcurl RapidJSON)
list(APPEND CORE_LIBRARIES ZLIB::ZLIB concurrentqueue RapidJSON spdlog Threads::Threads gsl-lite range-v3 expected-lite date::date date::tz asio magic_enum OpenSSL::Crypto OpenSSL::SSL CURL::libcurl RapidJSON)
if(NOT WIN32)
list(APPEND CORE_LIBRARIES OSSP::libuuid++)
endif()
Expand Down
2 changes: 1 addition & 1 deletion libminifi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ endif()

set(TLS_SOURCES "src/utils/tls/*.cpp" "src/io/tls/*.cpp")

file(GLOB SOURCES "src/agent/*.cpp" "src/properties/*.cpp" "src/utils/file/*.cpp" "src/sitetosite/*.cpp" "src/core/logging/*.cpp" "src/core/logging/internal/*.cpp" "src/core/logging/alert/*.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/flow/*.cpp" "src/core/json/*.cpp" "src/core/yaml/*.cpp" "src/core/reporting/*.cpp" "src/core/extension/*.cpp" "src/serialization/*.cpp" "src/provenance/*.cpp" "src/utils/*.cpp" "src/utils/crypto/*.cpp" "src/utils/crypto/ciphers/*.cpp" "src/utils/crypto/property_encryption/*.cpp" "src/*.cpp" "src/utils/net/*.cpp" "src/http/*.cpp")
file(GLOB SOURCES "src/agent/*.cpp" "src/properties/*.cpp" "src/utils/file/*.cpp" "src/sitetosite/*.cpp" "src/core/logging/*.cpp" "src/core/logging/internal/*.cpp" "src/core/logging/alert/*.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/core/*.cpp" "src/core/repository/*.cpp" "src/core/flow/*.cpp" "src/core/json/*.cpp" "src/core/yaml/*.cpp" "src/core/reporting/*.cpp" "src/core/extension/*.cpp" "src/serialization/*.cpp" "src/provenance/*.cpp" "src/utils/*.cpp" "src/*.cpp")
# manually add this as it might not yet be present when this executes
list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/agent_version.cpp")

Expand Down
95 changes: 0 additions & 95 deletions libminifi/include/utils/crypto/EncryptionManager.h

This file was deleted.

53 changes: 0 additions & 53 deletions libminifi/include/utils/crypto/EncryptionProvider.h

This file was deleted.

119 changes: 0 additions & 119 deletions libminifi/include/utils/crypto/EncryptionUtils.h

This file was deleted.

76 changes: 0 additions & 76 deletions libminifi/include/utils/crypto/ciphers/Aes256Ecb.h

This file was deleted.

Loading

0 comments on commit cf9189c

Please sign in to comment.