From d330b6aa02f8817188aeb223572539b429659033 Mon Sep 17 00:00:00 2001 From: liaogang Date: Fri, 24 Feb 2017 17:42:45 +0800 Subject: [PATCH] Mac OSX System configure --- CMakeLists.txt | 7 ++++--- cmake/system.cmake | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b0682c4fe..1bb18bb23a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,17 +14,18 @@ cmake_minimum_required(VERSION 3.0) -project(paddle CXX C) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") set(PROJ_ROOT ${CMAKE_SOURCE_DIR}) +include(system) + +project(paddle CXX C) + find_package(Sphinx) find_package(CUDA QUIET) find_package(Git REQUIRED) find_package(Threads REQUIRED) -include(system) include(simd) ################################ Configurations ####################################### diff --git a/cmake/system.cmake b/cmake/system.cmake index 58ac7dcb94..8da17744a4 100644 --- a/cmake/system.cmake +++ b/cmake/system.cmake @@ -29,7 +29,9 @@ ELSE(WIN32) SET(MACOS_VERSION ${VERSION}) SET(HOST_SYSTEM "macosx") IF(NOT DEFINED ENV{MACOSX_DEPLOYMENT_TARGET}) - SET(CMAKE_OSX_DEPLOYMENT_TARGET ${MACOS_VERSION}) + # Set cache variable - end user may change this during ccmake or cmake-gui configure. + SET(CMAKE_OSX_DEPLOYMENT_TARGET ${MACOS_VERSION} CACHE STRING + "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") ENDIF() ELSE(APPLE) -- GitLab