Skip to content

Commit 6d5e8e7

Browse files
committed
Rebased on main, verified can build MiNiFi w conan & cmake
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.
1 parent 8cdcd73 commit 6d5e8e7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

conanfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ def generate(self):
2424
tc.variables["MINIFI_OPENSSL_SOURCE"] = "CONAN"
2525
tc.variables["MINIFI_ZLIB_SOURCE"] = "CONAN"
2626

27+
tc.variables["SKIP_TESTS"] = "ON"
2728
tc.variables["ENABLE_LIBARCHIVE"] = "OFF"
2829
tc.variables["ENABLE_AWS"] = "OFF"
30+
tc.variables["ENABLE_EXPRESSION_LANGUAGE"] = "OFF"
2931

3032
tc.generate()
3133

0 commit comments

Comments
 (0)