Fix some review comments

Rever CMAKE_VERSION back to CMAKE on .env Fix typo on file name
raulcd · Jan 21, 2025 · 4b88388 · 4b88388
1 parent cc4cea4
commit 4b88388
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/.env b/.env
@@ -54,7 +54,7 @@ UBUNTU=22.04
 
 # Default versions for various dependencies
 CLANG_TOOLS=14
-CMAKE_VERSION=3.25.0
+CMAKE=3.25.0
 CUDA=11.2.2
 DASK=latest
 DOTNET=8.0

diff --git a/ci/rtools/BuildAwsCCommon.patch → ci/rtools/aws_c_common_ep.patch b/ci/rtools/BuildAwsCCommon.patch → ci/rtools/aws_c_common_ep.patch
@@ -23,7 +23,7 @@ index b717bca..5aa8ac9 100644
              list(APPEND AWS_C_FLAGS -Wno-strict-aliasing)
          endif()
 
-+         if(CMAKE_C_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32")
++         if (CMAKE_C_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32")
 +            list(APPEND AWS_C_FLAGS -D__USE_MINGW_ANSI_STDIO=1 -Wno-unused-local-typedefs)
 +        endif()
 +

diff --git a/ci/scripts/install_cmake.sh b/ci/scripts/install_cmake.sh
@@ -36,11 +36,6 @@ if [ -z ${archs[$arch]} ]; then
 fi
 arch=${archs[$arch]}
 
-declare -A platforms
-platforms=([linux]=linux
-           [macos]=macos
-           [windows]=windows)
-
 version=$1
 prefix=$2
 

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -5045,8 +5045,14 @@ macro(build_awssdk)
   # GH-44950: This is required to build under Rtools40 and we may be able to
   # remove it if/when we no longer need to build under Rtools40
   if(WIN32 AND NOT MSVC)
-    string(APPEND AWS_C_FLAGS " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args")
-    string(APPEND AWS_CXX_FLAGS " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args")
+    string(APPEND
+           AWS_C_FLAGS
+           " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args"
+    )
+    string(APPEND
+           AWS_CXX_FLAGS
+           " -D_WIN32_WINNT=0x0601 -Wno-error -Wno-error=format= -Wno-error=format-extra-args"
+    )
   endif()
 
   set(AWSSDK_COMMON_CMAKE_ARGS
@@ -5091,7 +5097,7 @@ macro(build_awssdk)
     find_program(PATCH patch REQUIRED)
     # Patch aws_c_common to build under Rtools40
     set(AWS_C_COMMON_PATCH_COMMAND ${PATCH} -p1 -i
-                                   ${CMAKE_SOURCE_DIR}/../ci/rtools/BuildAwsCCommon.patch)
+                                   ${CMAKE_SOURCE_DIR}/../ci/rtools/aws_c_common_ep.patch)
     message(STATUS "Hello ${AWS_C_COMMON_PATCH_COMMAND}")
     # aws_c_io_ep to build under Rtools40
     set(AWS_C_IO_PATCH_COMMAND ${PATCH} -p1 -i

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -390,7 +390,7 @@ services:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         gcc: ${GCC}
         llvm: ${LLVM}
     shm_size: *shm-size
@@ -427,7 +427,7 @@ services:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         gcc: ${GCC}
         llvm: ${LLVM}
     shm_size: *shm-size
@@ -458,7 +458,7 @@ services:
       cache_from:
         - ${REPO}:centos-7-cpp-static
       args:
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
     shm_size: *shm-size
     volumes:
       - .:/arrow:delegated
@@ -481,7 +481,7 @@ services:
       args:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     ulimits: *ulimits
@@ -576,7 +576,7 @@ services:
         arch: ${ARCH}
         base: nvidia/cuda:${CUDA}-devel-ubuntu${UBUNTU}
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     ulimits: *ulimits
@@ -627,7 +627,7 @@ services:
       args:
         arch: ${ARCH}
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     volumes: *ubuntu-volumes
@@ -707,7 +707,7 @@ services:
       args:
         arch: ${ARCH}
         clang_tools: ${CLANG_TOOLS}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         llvm: ${LLVM}
     shm_size: *shm-size
     volumes: *ubuntu-volumes
@@ -1595,7 +1595,7 @@ services:
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
         r_custom_ccache: ${R_CUSTOM_CCACHE}
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
     shm_size: *shm-size
     environment:
       <<: [*common, *sccache]
@@ -1625,7 +1625,7 @@ services:
         - ${REPO}:amd64-ubuntu-20.04-r-sanitizer
       args:
         base: wch1/r-debug:latest
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         r_bin: RDsan
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
@@ -1646,7 +1646,7 @@ services:
         - ${REPO}:r-rhub-clang-devel-latest
       args:
         base: rhub/clang-asan
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         r_dev: ${ARROW_R_DEV}
         r_bin: R
         tz: ${TZ}
@@ -1678,7 +1678,7 @@ services:
         - ${REPO}:amd64-ubuntu-20.04-r-valgrind
       args:
         base: wch1/r-debug:latest
-        cmake: ${CMAKE_VERSION}
+        cmake: ${CMAKE}
         r_bin: RDvalgrind
         tz: ${TZ}
     environment: