Skip to content

Commit 8cdcd73

Browse files
committed
Able to build minifi w most default ENABLED options except 2 of them
After I added new MiNiFi options for MINIFI_LIBCURL_SOURCE, MINIFI_OPENSSL_SOURCE and MINIFI_ZLIB_SOURCE all set to CONAN, I tried building MiNiFi with all the default ENABLED options, but there were two I needed to switch to OFF. I had to switch ENABLE_LIBARCHIVE and ENABLE_AWS to OFF because they failed to build. I do want to note that on my much larger PR where I built majority of MiNiFi using conan to install most of the external libs, I was able to build MiNiFi with openssl, libcurl, zlib and libarchive with no issues. I was also able to keep AWS enabled. I can do a follow PR where I bring back ENABLE_LIBARCHIVE and ENABLE_AWS to where we can set them to ON and be able to successfully build MiNiFi using conan
1 parent 9887967 commit 8cdcd73

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmake/GetOpenSSL.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
function(get_openssl SOURCE_DIR BINARY_DIR)
1919
if(MINIFI_OPENSSL_SOURCE STREQUAL "CONAN")
2020
message("Using Conan Packager to manage installing prebuilt OpenSSL external lib")
21-
# include(${CMAKE_BINARY_DIR}/OpenSSLConfig.cmake)
22-
find_package(OpenSSL REQUIRED)
21+
include(${CMAKE_BINARY_DIR}/OpenSSLConfig.cmake)
2322
elseif(MINIFI_OPENSSL_SOURCE STREQUAL "BUILD")
2423
message("Using CMAKE's ExternalProject_Add to manage source building OpenSSL external lib")
2524
include(BundledOpenSSL)

conanfile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,14 @@ class MiNiFiCppMain(ConanFile):
1919

2020
def generate(self):
2121
tc = CMakeToolchain(self)
22+
2223
tc.variables["MINIFI_LIBCURL_SOURCE"] = "CONAN"
2324
tc.variables["MINIFI_OPENSSL_SOURCE"] = "CONAN"
2425
tc.variables["MINIFI_ZLIB_SOURCE"] = "CONAN"
26+
27+
tc.variables["ENABLE_LIBARCHIVE"] = "OFF"
28+
tc.variables["ENABLE_AWS"] = "OFF"
29+
2530
tc.generate()
2631

2732
def build(self):

0 commit comments

Comments
 (0)