From 52db01ea6d1e75dd88426f5144148c74e7356948 Mon Sep 17 00:00:00 2001 From: Randi Joseph Date: Fri, 23 Dec 2016 02:54:34 -0500 Subject: [PATCH] Silence CMake policy warning on macos. See: https://cmake.org/cmake/help/v3.0/policy/CMP0042.html --- CMakeLists.txt | 3 +++ contrib/otshell_utils/CMakeLists.txt | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87a53c368..e6e4afb62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,6 +174,9 @@ include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/versi if(APPLE) include_directories(SYSTEM /usr/include/malloc) + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) + endif() endif() if(MSVC OR MINGW) diff --git a/contrib/otshell_utils/CMakeLists.txt b/contrib/otshell_utils/CMakeLists.txt index 464b125e4..263f07c85 100644 --- a/contrib/otshell_utils/CMakeLists.txt +++ b/contrib/otshell_utils/CMakeLists.txt @@ -3,6 +3,10 @@ project (otshell CXX) # Add executable +if(APPLE AND POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) +endif() + file(GLOB otshell_utils_sources # All files in directory: "*.h" "*.hpp"