Skip to content

Commit

Permalink
Rebased on main, verified can build MiNiFi w conan & cmake
Browse files Browse the repository at this point in the history
Followed Marton's suggested steps to remove my merge commit, then do an interactive rebase to only include
my commits and remove Gabor's commits to keep a clean PR-1793 for my MINIFICPP-2346-P1 branch. For building
MiNiFi using conan with conan's cmake wrapper, I disabled building TESTS and disabled expression language
since they were causing compile issues. I believe I resolved them in my follow up PR-1813, which will only
be ready for further review once my PR-1793 is ready for merge and merged. After disabling these two components
of the build, I was able to build MiNiFi successfully. I verified I could still build MiNiFi using standalone cmake
and also verified I could still build it with TESTS enabled and expression language enabled and the other necessary
features that needed to be enabled to build MiNIFi with TESTS enabled. For the MiNiFi standalone cmake build,
I disabled features that werent needed like extra extensions for building faster.
  • Loading branch information
james94 committed Jun 25, 2024
1 parent 8cdcd73 commit 6d5e8e7
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ def generate(self):
tc.variables["MINIFI_OPENSSL_SOURCE"] = "CONAN"
tc.variables["MINIFI_ZLIB_SOURCE"] = "CONAN"

tc.variables["SKIP_TESTS"] = "ON"
tc.variables["ENABLE_LIBARCHIVE"] = "OFF"
tc.variables["ENABLE_AWS"] = "OFF"
tc.variables["ENABLE_EXPRESSION_LANGUAGE"] = "OFF"

tc.generate()

Expand Down

0 comments on commit 6d5e8e7

Please sign in to comment.