From bd27d57ce069ceb8cede8c7e04c55a42b0d58682 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 20 Apr 2015 10:17:59 +0200 Subject: [PATCH] Add pass through for Include paths from outside in. --- CMakeLists.txt | 2 +- GNUmakefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f46a150120..ab546d7237 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -387,7 +387,7 @@ endif () ### @brief project source ################################################################################ -include_directories(${PROJECT_SOURCE_DIR}) +include_directories(${PROJECT_SOURCE_DIR} ${CUSTOM_INCLUDES}) ## ----------------------------------------------------------------------------- ## --SECTION-- COMMON MACROS diff --git a/GNUmakefile b/GNUmakefile index 5710c3ec24..07b8e81f30 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -144,7 +144,7 @@ pack-macosxcode: ./configure \ --prefix=/opt/arangodb - ${MAKE} -f GNUMakefile pack-macosxcode-cmake + ${MAKE} -f GNUMakefile pack-macosxcode-cmake CMAKE_ARGS=$(CMAKE_ARGS) pack-macosxcode-cmake: cd Build && cmake \ @@ -159,6 +159,7 @@ pack-macosxcode-cmake: -D "V8_VERSION=${V8_VERSION}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \ -G Xcode \ + ${CMAKE_ARGS) \ .. ################################################################################