This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 0300a77c854a051418db8d41bb3c27fb99f44a72 Author: Ferenc Gerlits <[email protected]> AuthorDate: Mon Jun 15 12:25:52 2026 +0200 MINIFICPP-2821 Enable the remaining extensions in the Conan build enable - Llamacpp - AWS - Lua Closes #2198 Signed-off-by: Marton Szasz <[email protected]> --- .github/PULL_REQUEST_TEMPLATE.md | 6 +-- CMakeLists.txt | 4 +- cmake/BundledAwsSdkCpp.cmake | 7 ++-- cmake/BundledOpenSSL.cmake | 2 + .../libtest/CMakeLists.txt => cmake/GetLua.cmake | 12 +++--- cmake/GetOpenSSL.cmake | 21 ++++++----- .../libtest/CMakeLists.txt => cmake/GetSol2.cmake | 12 +++--- cmake/Lua.cmake | 3 +- cmake/MiNiFiOptions.cmake | 2 + cmake/Sol2.cmake | 6 ++- conanfile.py | 8 ++-- .../cpp-extension-lib/libtest/CMakeLists.txt | 2 +- extensions/lua/CMakeLists.txt | 10 ++--- extensions/lua/tests/CMakeLists.txt | 1 - thirdparty/aws-sdk-cpp/aws-c-cal.patch | 2 +- thirdparty/aws-sdk-cpp/bundle-openssl.patch | 43 ---------------------- thirdparty/aws-sdk-cpp/dll-export-injection.patch | 2 +- thirdparty/aws-sdk-cpp/s2n.patch | 8 ++-- 18 files changed, 56 insertions(+), 95 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 132bc5287..70c26a320 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,9 @@ Thank you for submitting a contribution to Apache NiFi - MiNiFi C++. -In order to streamline the review of the contribution we ask you -to ensure the following steps have been taken: +In order to streamline the review of the contribution we ask you to ensure the following steps have been taken: ### For all changes: -- [ ] Is there a JIRA ticket associated with this PR? Is it referenced - in the commit message? +- [ ] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message? - [ ] Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character. diff --git a/CMakeLists.txt b/CMakeLists.txt index fac77f326..168aa6f24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,10 +239,8 @@ endif() # OpenSSL include(GetOpenSSL) -get_openssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}") -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl") - +# BZip2 if (ENABLE_BZIP2 AND (ENABLE_LIBARCHIVE OR (ENABLE_ROCKSDB AND NOT WIN32))) include(GetBZip2) get_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) diff --git a/cmake/BundledAwsSdkCpp.cmake b/cmake/BundledAwsSdkCpp.cmake index cdcb613d5..54e87e9f8 100644 --- a/cmake/BundledAwsSdkCpp.cmake +++ b/cmake/BundledAwsSdkCpp.cmake @@ -87,8 +87,8 @@ function(use_bundled_libaws SOURCE_DIR BINARY_DIR) "-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libaws-install" "-DCMAKE_MODULE_PATH=${ESCAPED_CMAKE_MODULE_PATH}" "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}" - "-DFIND_OPENSSL_PATH=${SOURCE_DIR}/cmake/ssl/FindOpenSSL.cmake" - "-DFIND_CRYPTO_PATH=${SOURCE_DIR}/cmake/ssl/FindCrypto.cmake" + "-DFIND_OPENSSL_PATH=${FIND_OPENSSL_PATH}" + "-DFIND_CRYPTO_PATH=${FIND_CRYPTO_PATH}" "-DCURL_ROOT_DIR=${CURL_ROOT_DIR}" "-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}" "-DZLIB_INCLUDE_DIRS=${ZLIB_INCLUDE_DIRS}" @@ -110,7 +110,8 @@ function(use_bundled_libaws SOURCE_DIR BINARY_DIR) aws-sdk-cpp-external GIT_REPOSITORY "https://github.com/aws/aws-sdk-cpp.git"; GIT_TAG "1.11.807" - UPDATE_COMMAND git submodule update --init --recursive + GIT_SHALLOW TRUE + UPDATE_COMMAND git submodule update --init --recursive --depth=1 SOURCE_DIR "${BINARY_DIR}/thirdparty/aws-sdk-cpp-src" INSTALL_DIR "${BINARY_DIR}/thirdparty/libaws-install" LIST_SEPARATOR % # This is needed for passing semicolon-separated lists diff --git a/cmake/BundledOpenSSL.cmake b/cmake/BundledOpenSSL.cmake index fdc1afc61..61a6fb9c5 100644 --- a/cmake/BundledOpenSSL.cmake +++ b/cmake/BundledOpenSSL.cmake @@ -260,5 +260,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR) add_dependencies(OpenSSL::Crypto openssl-fips-external) set(OPENSSL_ROOT_DIR "${OPENSSL_BIN_DIR}" CACHE INTERNAL "Strict single source of truth for bundled OpenSSL") + set(FIND_OPENSSL_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl/FindOpenSSL.cmake" CACHE INTERNAL "Location of the FindOpenSSL file, for other dependencies") + set(FIND_CRYPTO_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl/FindCrypto.cmake" CACHE INTERNAL "Location of the FindCrypto file, for other dependencies") endfunction(use_openssl) diff --git a/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt b/cmake/GetLua.cmake similarity index 76% copy from extension-framework/cpp-extension-lib/libtest/CMakeLists.txt copy to cmake/GetLua.cmake index a75111901..13cfbf141 100644 --- a/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt +++ b/cmake/GetLua.cmake @@ -1,5 +1,4 @@ # Licensed to the Apache Software Foundation (ASF) under one -# # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information # regarding copyright ownership. The ASF licenses this file @@ -15,8 +14,11 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# -add_library(libminifi-c-unittest INTERFACE) -target_link_libraries(libminifi-c-unittest INTERFACE minifi-cpp-extension-lib core-minifi Catch2WithMain) -target_include_directories(libminifi-c-unittest INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") +if(MINIFI_LUA_SOURCE STREQUAL "CONAN") + message("Using Conan to install Lua") + find_package(lua REQUIRED) +elseif(MINIFI_LUA_SOURCE STREQUAL "BUILD") + message("Using CMake to build Lua from source") + include(Lua) +endif() diff --git a/cmake/GetOpenSSL.cmake b/cmake/GetOpenSSL.cmake index 58132c6bf..453e1db24 100644 --- a/cmake/GetOpenSSL.cmake +++ b/cmake/GetOpenSSL.cmake @@ -15,13 +15,14 @@ # specific language governing permissions and limitations # under the License. -function(get_openssl SOURCE_DIR BINARY_DIR) - if(MINIFI_OPENSSL_SOURCE STREQUAL "CONAN") - message("Using Conan to install OpenSSL") - find_package(OpenSSL REQUIRED) - elseif(MINIFI_OPENSSL_SOURCE STREQUAL "BUILD") - message("Using CMake to build OpenSSL from source") - include(BundledOpenSSL) - use_openssl(${SOURCE_DIR} ${BINARY_DIR}) - endif() -endfunction(get_openssl) +if(MINIFI_OPENSSL_SOURCE STREQUAL "CONAN") + message("Using Conan to install OpenSSL") + find_package(OpenSSL REQUIRED) + set(FIND_OPENSSL_PATH "${CMAKE_BINARY_DIR}/FindOpenSSL.cmake" CACHE INTERNAL "Location of the FindOpenSSL file, for other dependencies") + set(FIND_CRYPTO_PATH "${CMAKE_BINARY_DIR}/FindOpenSSL.cmake" CACHE INTERNAL "Conan's FindOpenSSL finds the Crypto library, too") +elseif(MINIFI_OPENSSL_SOURCE STREQUAL "BUILD") + message("Using CMake to build OpenSSL from source") + include(BundledOpenSSL) + use_openssl(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl") +endif() diff --git a/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt b/cmake/GetSol2.cmake similarity index 76% copy from extension-framework/cpp-extension-lib/libtest/CMakeLists.txt copy to cmake/GetSol2.cmake index a75111901..572f94833 100644 --- a/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt +++ b/cmake/GetSol2.cmake @@ -1,5 +1,4 @@ # Licensed to the Apache Software Foundation (ASF) under one -# # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information # regarding copyright ownership. The ASF licenses this file @@ -15,8 +14,11 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# -add_library(libminifi-c-unittest INTERFACE) -target_link_libraries(libminifi-c-unittest INTERFACE minifi-cpp-extension-lib core-minifi Catch2WithMain) -target_include_directories(libminifi-c-unittest INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") +if(MINIFI_SOL2_SOURCE STREQUAL "CONAN") + message("Using Conan to install Sol2") + find_package(sol2 REQUIRED) +elseif(MINIFI_SOL2_SOURCE STREQUAL "BUILD") + message("Using CMake to build Sol2 from source") + include(Sol2) +endif() diff --git a/cmake/Lua.cmake b/cmake/Lua.cmake index f558bbe86..e2eaaf9de 100644 --- a/cmake/Lua.cmake +++ b/cmake/Lua.cmake @@ -35,10 +35,11 @@ if(NOT lua_POPULATED) # the github tarball contains onelua.c, which is a concatenated version of all source files, we don't need it list(REMOVE_ITEM LUA_SOURCES "${lua_SOURCE_DIR}/${lua_tarball_src_path}onelua.c") add_library(lua STATIC ${LUA_SOURCES}) + add_library(lua::lua ALIAS lua) file(MAKE_DIRECTORY "${lua_BINARY_DIR}/include") foreach(HEADER lua.h luaconf.h lualib.h lauxlib.h) file(COPY "${lua_SOURCE_DIR}/${lua_tarball_src_path}${HEADER}" DESTINATION "${lua_BINARY_DIR}/include") endforeach() - set(LUA_INCLUDE_DIR "${lua_BINARY_DIR}/include" CACHE STRING "" FORCE) + set(lua_INCLUDE_DIR "${lua_BINARY_DIR}/include" CACHE STRING "" FORCE) endif() diff --git a/cmake/MiNiFiOptions.cmake b/cmake/MiNiFiOptions.cmake index d85519559..5c9820d41 100644 --- a/cmake/MiNiFiOptions.cmake +++ b/cmake/MiNiFiOptions.cmake @@ -153,6 +153,8 @@ add_minifi_multi_option(MINIFI_FMT_SOURCE "Retrieves Fmt from provided source" " add_minifi_multi_option(MINIFI_SPDLOG_SOURCE "Retrieves Spdlog from provided source" "BUILD;SYSTEM;CONAN" "BUILD") add_minifi_multi_option(MINIFI_CATCH2_SOURCE "Retrieves Catch2 from provided source" "BUILD;SYSTEM;CONAN" "BUILD") add_minifi_multi_option(MINIFI_LIBARCHIVE_SOURCE "Retrieves libarchive from provided source" "BUILD;SYSTEM;CONAN" "BUILD") +add_minifi_multi_option(MINIFI_LUA_SOURCE "Retrieves Lua from provided source" "BUILD;SYSTEM;CONAN" "BUILD") +add_minifi_multi_option(MINIFI_SOL2_SOURCE "Retrieves Sol2 from provided source" "BUILD;SYSTEM;CONAN" "BUILD") # Docker options diff --git a/cmake/Sol2.cmake b/cmake/Sol2.cmake index 3dbe63cb1..d14f54762 100644 --- a/cmake/Sol2.cmake +++ b/cmake/Sol2.cmake @@ -17,9 +17,11 @@ include(FetchContent) -FetchContent_Declare(sol2_src +FetchContent_Declare(sol2 URL https://github.com/ThePhD/sol2/archive/refs/tags/v3.5.0.tar.gz URL_HASH SHA256=86c0f6d2836b184a250fc2907091c076bf53c9603dd291eaebade36cc342e13c SYSTEM ) -FetchContent_MakeAvailable(sol2_src) +FetchContent_MakeAvailable(sol2) + +set(sol2_INCLUDE_DIR "${sol2_BINARY_DIR}/include" CACHE STRING "" FORCE) diff --git a/conanfile.py b/conanfile.py index 330f72904..a1047b2f6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,7 +8,7 @@ import shutil required_conan_version = ">=2.0" shared_requires = ("lz4/1.10.0", "openssl/3.6.2", "libcurl/8.20.0", "civetweb/1.16", "libxml2/2.15.3", "fmt/12.1.0", "spdlog/1.17.0", "catch2/3.14.0", "zlib/1.3.2", "zstd/1.5.7", - "bzip2/1.0.8", "rocksdb/11.1.1@minifi/develop", "libarchive/3.8.7") + "bzip2/1.0.8", "rocksdb/11.1.1@minifi/develop", "libarchive/3.8.7", "lua/5.4.6", "sol2/3.5.0") shared_sources = ("CMakeLists.txt", "libminifi/*", "extensions/*", "minifi_main/*", "behave_framework/*", "bin/*", "bootstrap/*", "cmake/*", "conf/*", "controller/*", "core-framework/*", "docs/*", "encrypt-config/*", "etc/*", "examples/*", "extension-framework/*", "fips/*", "minifi-api/*", "packaging/*", "thirdparty/*", "docker/*", "LICENSE", "NOTICE", @@ -46,10 +46,8 @@ class MiNiFiCppMain(ConanFile): tc.variables["MINIFI_SPDLOG_SOURCE"] = "CONAN" tc.variables["MINIFI_CATCH2_SOURCE"] = "CONAN" tc.variables["MINIFI_LIBARCHIVE_SOURCE"] = "CONAN" - - tc.variables["ENABLE_AWS"] = "OFF" - tc.variables["ENABLE_LLAMACPP"] = "OFF" - tc.variables["ENABLE_LUA_SCRIPTING"] = "OFF" + tc.variables["MINIFI_LUA_SOURCE"] = "CONAN" + tc.variables["MINIFI_SOL2_SOURCE"] = "CONAN" tc.generate() diff --git a/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt b/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt index a75111901..07b78a97a 100644 --- a/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt +++ b/extension-framework/cpp-extension-lib/libtest/CMakeLists.txt @@ -18,5 +18,5 @@ # add_library(libminifi-c-unittest INTERFACE) -target_link_libraries(libminifi-c-unittest INTERFACE minifi-cpp-extension-lib core-minifi Catch2WithMain) +target_link_libraries(libminifi-c-unittest INTERFACE minifi-cpp-extension-lib core-minifi) target_include_directories(libminifi-c-unittest INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/extensions/lua/CMakeLists.txt b/extensions/lua/CMakeLists.txt index 3a8ca0301..b5fe501f3 100644 --- a/extensions/lua/CMakeLists.txt +++ b/extensions/lua/CMakeLists.txt @@ -21,8 +21,8 @@ if (NOT (ENABLE_ALL OR ENABLE_LUA_SCRIPTING)) return() endif() -include(Lua) -include(Sol2) +include(GetLua) +include(GetSol2) include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt) @@ -35,10 +35,8 @@ target_link_libraries(minifi-lua-script-extension PRIVATE ${LIBMINIFI} Threads:: SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION ASC) -target_include_directories(minifi-lua-script-extension PRIVATE lua) -target_include_directories(minifi-lua-script-extension PUBLIC ${LUA_INCLUDE_DIR}) - -target_link_libraries(minifi-lua-script-extension PUBLIC lua sol2) +target_include_directories(minifi-lua-script-extension PUBLIC ${lua_INCLUDE_DIR} ${sol2_INCLUDE_DIR}) +target_link_libraries(minifi-lua-script-extension PUBLIC lua::lua sol2::sol2) target_compile_features(minifi-lua-script-extension PUBLIC cxx_std_14) register_extension(minifi-lua-script-extension "LUA SCRIPTING EXTENSIONS" LUA-SCRIPTING-EXTENSIONS "This enables LUA scripting" "extensions/lua/tests") diff --git a/extensions/lua/tests/CMakeLists.txt b/extensions/lua/tests/CMakeLists.txt index abe00a1cb..ba14e175a 100644 --- a/extensions/lua/tests/CMakeLists.txt +++ b/extensions/lua/tests/CMakeLists.txt @@ -25,7 +25,6 @@ FOREACH(testfile ${EXECUTESCRIPT_LUA_TESTS}) get_filename_component(testfilename "${testfile}" NAME_WE) add_minifi_executable("${testfilename}" "${testfile}") target_include_directories(${testfilename} PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/lua") - target_include_directories(${testfilename} SYSTEM PRIVATE BEFORE "${SOL2_INCLUDE_DIR}") target_link_libraries(${testfilename} minifi-lua-script-extension minifi-script-extension) target_link_libraries(${testfilename} Catch2WithMain) createTests("${testfilename}") diff --git a/thirdparty/aws-sdk-cpp/aws-c-cal.patch b/thirdparty/aws-sdk-cpp/aws-c-cal.patch index 3211a0608..13eb896c4 100644 --- a/thirdparty/aws-sdk-cpp/aws-c-cal.patch +++ b/thirdparty/aws-sdk-cpp/aws-c-cal.patch @@ -10,7 +10,7 @@ index 5d30c6d..dd20fb4 100644 + include(${FIND_OPENSSL_PATH}) find_package(Threads REQUIRED) list(APPEND PLATFORM_LIBS OpenSSL::Crypto Threads::Threads) - message(STATUS "Using libcrypto: ${OPENSSL_CRYPTO_LIBRARY}") + message(STATUS "Using libcrypto from system: ${OPENSSL_CRYPTO_LIBRARY}") @@ -138,7 +138,7 @@ if (NOT BYO_CRYPTO) list(APPEND PLATFORM_LIBS crypto) elseif(AWSLC_PREBUILT) diff --git a/thirdparty/aws-sdk-cpp/bundle-openssl.patch b/thirdparty/aws-sdk-cpp/bundle-openssl.patch deleted file mode 100644 index 1c2391be2..000000000 --- a/thirdparty/aws-sdk-cpp/bundle-openssl.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/crt/aws-crt-cpp/crt/s2n/CMakeLists.txt b/crt/aws-crt-cpp/crt/s2n/CMakeLists.txt -index 2acb62d91..05b8137e4 100644 ---- a/crt/aws-crt-cpp/crt/s2n/CMakeLists.txt -+++ b/crt/aws-crt-cpp/crt/s2n/CMakeLists.txt -@@ -264,9 +264,9 @@ if (TARGET crypto) - message(STATUS "S2N found target: crypto") - set(LINK_LIB "crypto") - else() -- find_package(crypto REQUIRED) -+ find_package(OpenSSL REQUIRED) - message(STATUS "Using libcrypto from the cmake path") -- set(LINK_LIB "AWS::crypto") -+ set(LINK_LIB "OpenSSL::Crypto") - endif() - - if (S2N_INTERN_LIBCRYPTO) -@@ -375,11 +375,11 @@ endif() - - if (S2N_INTERN_LIBCRYPTO) - -- # Check if the AWS::crypto target has been added and handle it -- if (TARGET AWS::crypto) -+ # Check if the OpenSSL::Crypto target has beeen added and handle it -+ if (TARGET OpenSSL::Crypto) - # Get the target library type (shared or static) -- get_target_property(target_type AWS::crypto TYPE) -- message(STATUS "AWS::crypto target type: ${target_type}") -+ get_target_property(target_type OpenSSL::Crypto TYPE) -+ message(STATUS "OpenSSL::Crypto target type: ${target_type}") - - # If we didn't find the a target with static library type, fallback to - # existing crypto_STATIC_LIBRARY and crypto_INCLUDE_DIR -@@ -388,8 +388,8 @@ if (S2N_INTERN_LIBCRYPTO) - # The finder module defines these appropriately, but if we go through - # the target config we need to query this information from the target - # first. -- get_target_property(crypto_STATIC_LIBRARY AWS::crypto LOCATION) -- get_target_property(crypto_INCLUDE_DIR AWS::crypto INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(crypto_STATIC_LIBRARY OpenSSL::Crypto LOCATION) -+ get_target_property(crypto_INCLUDE_DIR OpenSSL::Crypto INTERFACE_INCLUDE_DIRECTORIES) - endif() - endif() - diff --git a/thirdparty/aws-sdk-cpp/dll-export-injection.patch b/thirdparty/aws-sdk-cpp/dll-export-injection.patch index 51e087ab0..beffc55e0 100644 --- a/thirdparty/aws-sdk-cpp/dll-export-injection.patch +++ b/thirdparty/aws-sdk-cpp/dll-export-injection.patch @@ -76,7 +76,7 @@ diff --git a/src/aws-cpp-sdk-core/CMakeLists.txt b/src/aws-cpp-sdk-core/CMakeLis index c6a0f1c262e..5e21622a80e 100644 --- a/src/aws-cpp-sdk-core/CMakeLists.txt +++ b/src/aws-cpp-sdk-core/CMakeLists.txt -@@ -634,6 +634,11 @@ elseif (BUILD_SHARED_LIBS) +@@ -659,6 +659,11 @@ elseif (BUILD_SHARED_LIBS) target_compile_definitions(${PROJECT_NAME} PRIVATE "SMITHY_EXPORTS=1") endif() diff --git a/thirdparty/aws-sdk-cpp/s2n.patch b/thirdparty/aws-sdk-cpp/s2n.patch index 7f51198f3..6fdcd0e0f 100644 --- a/thirdparty/aws-sdk-cpp/s2n.patch +++ b/thirdparty/aws-sdk-cpp/s2n.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2acb62d91..6470de162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -264,9 +264,9 @@ if (TARGET crypto) +@@ -270,9 +270,9 @@ if (TARGET crypto) message(STATUS "S2N found target: crypto") set(LINK_LIB "crypto") else() @@ -14,7 +14,7 @@ index 2acb62d91..6470de162 100644 endif() if (S2N_INTERN_LIBCRYPTO) -@@ -375,11 +375,11 @@ endif() +@@ -390,11 +390,11 @@ endif() if (S2N_INTERN_LIBCRYPTO) @@ -30,7 +30,7 @@ index 2acb62d91..6470de162 100644 # If we didn't find the a target with static library type, fallback to # existing crypto_STATIC_LIBRARY and crypto_INCLUDE_DIR -@@ -388,8 +388,8 @@ if (S2N_INTERN_LIBCRYPTO) +@@ -403,8 +403,8 @@ if (S2N_INTERN_LIBCRYPTO) # The finder module defines these appropriately, but if we go through # the target config we need to query this information from the target # first. @@ -41,7 +41,7 @@ index 2acb62d91..6470de162 100644 endif() endif() -@@ -773,7 +773,3 @@ install(EXPORT "${PROJECT_NAME}-targets" +@@ -788,7 +788,3 @@ install(EXPORT "${PROJECT_NAME}-targets" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/" COMPONENT Development)
