Repository navigation
Commit 9b64814
committed
apacheGH-44950: [C++] Bump minimum CMake version to 3.25
Try installing CMake 3.25 manually on Ubuntu
Install cmake in linux-apt-lint.dockerfile and update install_cmake.sh to not require platform argument
Install CMake 3.25.0 on several Ubuntu jobs and Windows jobs that require the existing version to be bumped
Several fixes to install_cmake
Some more fixes and upgrade minimal examples to use Ubuntu 24.04
Some more fixes for R
Update from CMAKE to CMAKE_VERSION
Ensure that versions returned are strings, bump cmake download
Try forcing MINGW package to pull a newer CMake
Revert trying to pull newer CMake
Try to completely remove mingw CMake from CRAN
/c/cmake/bin/cmake.exe should be present and in path, try with .exe
Try with full path for CMake
Try removing manual installation of CMake and installing CMake via pacman before setting up RTools
Remove manual Installation of CMake from pacman not present
More tries
Temporarily try using msys2 GH action to install cmake
Remove CMake from PKGBUILD
CMake should be in the path
Debug new CMake location
Try with C:\Program Files\CMake\bin\cmake.exe
Just testing at this point
Bundle AWSSDK under RTools (#90)
Check for mingw
Check Windows compiler
Try modifying patch due to redefinition
Try fixing patch
AWS is bundled on Windows R now, do not use MSYS libraries
Fix license header on patch + add CMake condition for AWS patch
Update configure.win to remove specific AWS CPP libs
Update r/configure.win
Co-authored-by: Bryce Mecum <[email protected]>
Update r/configure.win
Test turning ccache back on
Update ci/scripts/r_windows_build.sh
Co-authored-by: Neal Richardson <[email protected]>
Update r/configure.win
Co-authored-by: Neal Richardson <[email protected]>
Review comments
Remove MSYS2_ARG_CONV_EXCL
Testing with manually adding missing rtools40
Add correct slash for path
Add comment on why MSYS2_ARG_CONV_EXCL is required
Use MSYS2_ARG_CONV_EXCL on the same CMake command
Update tutorial examples to use a newer Ubuntu
Add CMAKE_VERSION to cuda jobs
Upgrade minimal Ubuntu to use 24.04 instead of 22.04
Fix minimal build for Ubuntu 24.04
ubuntu-cuda-cpp requires cmake argument
Add cmake to docker-compose.yml missing images
Add missing cmake to some more images
Some more fixing mainly for R binary jobs
Set CMAKE to newly installed path
Revert "Try modifying patch due to redefinition"
This reverts commit b772b23.
Reapply "Try modifying patch due to redefinition"
This reverts commit 1d71375.
Hardcode enum value
I tried to find a proper way to include-guard this but
everything I tried didn't work.
Remove outdated refs to aws libs
Since we are bundling these we don't have these to copy
Move _WIN32_WINNT def into {c,cxx}flags
Ignore warnings-as-errors in cmake1 parent 1a01b40 commit 9b64814
36 files changed
Lines changed: 516 additions & 59 deletions
File tree
- .github/workflows
- ci
- docker
- rtools
- scripts
- cpp
- cmake_modules
- examples
- minimal_build
- parquet/parquet_arrow
- tutorial_examples
- dev/tasks
- python-wheels
- vcpkg-tests
- docs/source/cpp
- matlab
- python
- examples/minimal_build
- r
- tools
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
57 | 58 | | |
58 | 59 | | |
59 | 60 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
168 | 173 | | |
169 | 174 | | |
170 | 175 | | |
| |||
324 | 329 | | |
325 | 330 | | |
326 | 331 | | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
327 | 337 | | |
328 | 338 | | |
329 | 339 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
56 | 61 | | |
57 | 62 | | |
58 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
282 | 282 | | |
283 | 283 | | |
284 | 284 | | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
285 | 291 | | |
286 | 292 | | |
287 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | 40 | | |
42 | 41 | | |
43 | 42 | | |
| |||
49 | 48 | | |
50 | 49 | | |
51 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
52 | 55 | | |
53 | 56 | | |
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
57 | | - | |
| 60 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
54 | 58 | | |
55 | 59 | | |
56 | 60 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
| 56 | + | |
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
| |||
68 | 67 | | |
69 | 68 | | |
70 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
71 | 74 | | |
72 | 75 | | |
73 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
71 | 70 | | |
72 | 71 | | |
73 | 72 | | |
| |||
121 | 120 | | |
122 | 121 | | |
123 | 122 | | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
124 | 127 | | |
125 | 128 | | |
126 | 129 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
71 | 75 | | |
72 | 76 | | |
73 | 77 | | |
| |||
0 commit comments