diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca6ef8c782..13e9ec852e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,15 @@
 #
 #************************************************
 
+# Set CMAKE_POLICY_VERSION_MINIMUM to 3.5 if CMAKE version >= 4
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 4)
+  set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+endif()
+
 # Define minimum cmake version
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
+
 # Define minimum compiler versions
 set(MIN_GCC_VERSION 9.1)
 set(MIN_ICC_VERSION 15.0.2)
diff --git a/cmake/MacOSX.cmake b/cmake/MacOSX.cmake
index 898ff95ea6..b555826ab5 100644
--- a/cmake/MacOSX.cmake
+++ b/cmake/MacOSX.cmake
@@ -39,6 +39,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   if(CMAKE_OSX_DEPLOYMENT_TARGET)
     set(OSX_MIN "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
   endif()
+  if ("${CMAKE_CXX_SYSROOT}" STREQUAL "")
+    execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isysroot${CMAKE_OSX_SYSROOT} ${OSX_MIN}")
   string(STRIP ${CMAKE_CXX_FLAGS} CMAKE_CXX_FLAGS)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot${CMAKE_OSX_SYSROOT} ${OSX_MIN}")
diff --git a/cmake/contrib.cmake b/cmake/contrib.cmake
index 1d47e68b52..71e571c732 100644
--- a/cmake/contrib.cmake
+++ b/cmake/contrib.cmake
@@ -223,7 +223,7 @@ if(NOT EXCLUDE_HEPMC)
     DOWNLOAD_COMMAND ${DL_CONTRIB} ${dl} ${md5} ${HEPMC_PATH} ${name} ${ver}
     SOURCE_DIR ${HEPMC_PATH}
     CMAKE_COMMAND ${CMAKE_COMMAND} ..
-    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${HEPMC_CXX_FLAGS} -DHEPMC3_ENABLE_ROOTIO=${HEPMC3_ROOTIO} -DCMAKE_INSTALL_PREFIX=${HEPMC_PATH}/local -DCMAKE_INSTALL_LIBDIR=${HEPMC_PATH}/local/lib -DHEPMC3_ENABLE_PYTHON=OFF -DHEPMC3_ENABLE_SEARCH=ON -DHEPMC3_BUILD_STATIC_LIBS=OFF
+    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${HEPMC_CXX_FLAGS} -DHEPMC3_ENABLE_ROOTIO=${HEPMC3_ROOTIO} -DCMAKE_INSTALL_PREFIX=${HEPMC_PATH}/local -DCMAKE_INSTALL_LIBDIR=${HEPMC_PATH}/local/lib -DHEPMC3_ENABLE_PYTHON=OFF -DHEPMC3_ENABLE_SEARCH=ON -DHEPMC3_BUILD_STATIC_LIBS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=${CMAKE_POLICY_VERSION_MINIMUM}
     BUILD_COMMAND ${MAKE_PARALLEL} ${lib}
     INSTALL_COMMAND ${CMAKE_INSTALL_COMMAND}
     )