-
Notifications
You must be signed in to change notification settings - Fork 506
ORC-2013: [C++] Bump to CMake 3.25+ to use FetchContent #2416
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
92abe65 to
fd72130
Compare
fd72130 to
99fbd29
Compare
a211c31 to
f08a5b2
Compare
|
The two failed CIs are due to outdated CMake versions from amazonlinux23 and debian11. Should we remove them? @dongjoon-hyun |
Do you mean to remove |
|
For |
|
Here is the |
|
For AmazonLinux2023, I confirmed that it has |
|
Unfortunately, |
|
FYI: Apache Arrow installs newer CMake manually on Amazon Linux 2023: https://github.com/apache/arrow/blob/33d1f32136f950520dcca278b77acff430dc8dca/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile#L64-L68 |
|
Good. I'll borrow that code. Thank you, @kou . |
|
Here is the PR for |
### What changes were proposed in this pull request? This PR aims to upgrade `CMake` to 3.26.0 in `amazonlinux:2023`. ### Why are the changes needed? Currently, it has 3.22.2 which is blocking #2416 . ``` $ docker run -it --rm apache/orc-dev:amazonlinux23 cmake --version cmake version 3.22.2 ``` ### How was this patch tested? Manual build and tests. ``` $ ./reinit.sh amazonlinux23 ``` ``` $ docker run -it --rm apache/orc-dev:amazonlinux23 cmake --version cmake version 3.26.0 CMake suite maintained and supported by Kitware (kitware.com/cmake). ``` ``` $ ./run-one.sh local x amazonlinux23 Started local run for main on amazonlinux23 at Wed Oct 8 00:03:37 PDT 2025 ... Test project /root/build Start 1: orc-test 1/9 Test #1: orc-test ......................... Passed 7.77 sec Start 2: java-test 2/9 Test #2: java-test ........................ Passed 118.90 sec Start 3: java-examples-test 3/9 Test #3: java-examples-test ............... Passed 0.43 sec Start 4: java-tools-test 4/9 Test #4: java-tools-test .................. Passed 0.07 sec Start 5: java-bench-gen-test 5/9 Test #5: java-bench-gen-test .............. Passed 0.77 sec Start 6: java-bench-scan-test 6/9 Test #6: java-bench-scan-test ............. Passed 0.71 sec Start 7: java-bench-hive-test 7/9 Test #7: java-bench-hive-test ............. Passed 11.41 sec Start 8: java-bench-spark-test 8/9 Test #8: java-bench-spark-test ............ Passed 216.61 sec Start 9: tool-test 9/9 Test #9: tool-test ........................ Passed 4.37 sec 100% tests passed, 0 tests failed out of 9 Total Test time (real) = 361.08 sec Built target test-out Finished amazonlinux23 at Wed Oct 8 00:16:38 PDT 2025 ``` ### Was this patch authored or co-authored using generative AI tooling? No. Closes #2435 from dongjoon-hyun/ORC-2016. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
|
New |
|
Thanks for doing this @wgtmac . I'm not sure if there's a way for me to test this out locally but if so I'm happy to try it. Otherwise looking forward to this making its way through conda |
|
@WillAyd I created conda-forge/orc-feedstock#94 to test this. Let's see what's going on. (cc @h-vetinari) |
|
|
||
| if (DEFINED ENV{SNAPPY_HOME}) | ||
| set (SNAPPY_HOME "$ENV{SNAPPY_HOME}") | ||
| elseif (Snappy_ROOT) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kou I have deleted lines like these so setting XXX_ROOT will not set XXX_HOME any more and it will skip FindXXXAlt.cmake by directly jumping to the FetchContent branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm OK with removing them as an Apache Arrow developer. But controlling wheter FindXXXAlt.cmake or FetchContent by only this may not be enough... I'll comment it on the https://github.com/apache/orc/pull/2416/files#r2387031578 thread.
dongjoon-hyun
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1, LGTM. Feel free to merge, @wgtmac .
ffacs
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1, LGTM.
|
Merged this. Thanks everyone! |
What changes were proposed in this pull request?
XXX_HOMEor its friends are set. This includes:FetchContentwithFIND_PACKAGE_ARGS. For 3rd party dependencies now, we try to find system installed one viaCONFIGmode or fallback to vendor it. This includes:Why are the changes needed?
How was this patch tested?
Was this patch authored or co-authored using generative AI tooling?
No