diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:32:30 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:32:30 -0800 |
| commit | 223055a86185444d2bcfe4b38bb4a44bbcddee66 (patch) | |
| tree | e7c5510b110706bb56078b3ca8cee4b5410b208e | |
| parent | Merge pull request #1490 (diff) | |
| parent | Silence CMake policy warning on macos. (diff) | |
| download | monero-223055a86185444d2bcfe4b38bb4a44bbcddee66.tar.xz | |
Merge pull request #1491
52db01ea Silence CMake policy warning on macos. See: https://cmake.org/cmake/help/v3.0/policy/CMP0042.html (Randi Joseph)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | contrib/otshell_utils/CMakeLists.txt | 4 |
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" |