Removing CMP0126 OLD policy behavior and force unset ZLIB_LIBRARY

apache · Jan 30, 2025 · a4b9e1b · a4b9e1b
1 parent da4e777
commit a4b9e1b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -18,11 +18,6 @@
 cmake_minimum_required(VERSION 3.25)
 message(STATUS "Building using CMake version: ${CMAKE_VERSION}")
 
-# https://cmake.org/cmake/help/latest/policy/CMP0126.html
-#
-# set(CACHE) does not remove a normal variable of the same name.
-cmake_policy(SET CMP0126 OLD)
-
 # https://www.cmake.org/cmake/help/latest/policy/CMP0025.html
 #
 # Compiler id for Apple Clang is now AppleClang.

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -4640,6 +4640,7 @@ function(build_orc)
     set(ZLIB_HOME
         ${ZLIB_ROOT}
         CACHE STRING "" FORCE)
+    set(unset ZLIB_LIBRARY)
     set(ZLIB_LIBRARY
         ZLIB::ZLIB
         CACHE STRING "" FORCE)