Merge pull request #1491

52db01ea Silence CMake policy warning on macos. See: https://cmake.org/cmake/help/v3.0/policy/CMP0042.html (Randi Joseph)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:32:30 -08:00
commit 223055a861
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 7 additions and 0 deletions

View File

@ -174,6 +174,9 @@ include_directories(src contrib/epee/include external "${CMAKE_BINARY_DIR}/versi
if(APPLE) if(APPLE)
include_directories(SYSTEM /usr/include/malloc) include_directories(SYSTEM /usr/include/malloc)
if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
endif()
endif() endif()
if(MSVC OR MINGW) if(MSVC OR MINGW)

View File

@ -3,6 +3,10 @@ project (otshell CXX)
# Add executable # Add executable
if(APPLE AND POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
endif()
file(GLOB otshell_utils_sources # All files in directory: file(GLOB otshell_utils_sources # All files in directory:
"*.h" "*.h"
"*.hpp" "*.hpp"