aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandi Joseph <randi@codehalo.com>2016-12-23 02:54:34 -0500
committerRandi Joseph <randi@codehalo.com>2016-12-23 02:54:34 -0500
commit52db01ea6d1e75dd88426f5144148c74e7356948 (patch)
tree4b0be95f4bf172e30442cd11fdbc9a5c8dda3218
parentMerge pull request #1487 (diff)
downloadmonero-52db01ea6d1e75dd88426f5144148c74e7356948.tar.xz
Silence CMake policy warning on macos.
See: https://cmake.org/cmake/help/v3.0/policy/CMP0042.html
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt3
-rw-r--r--contrib/otshell_utils/CMakeLists.txt4
2 files changed, 7 insertions, 0 deletions
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"