This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push: new c030242 GEODE-4637: Allow only GEODE_HOME, remove GEODE (#268) c030242 is described below commit c030242c198f16bb2aee9781240a603ec55fbef2 Author: Michael Martell <mmart...@pivotal.io> AuthorDate: Wed Apr 11 14:28:07 2018 -0700 GEODE-4637: Allow only GEODE_HOME, remove GEODE (#268) * Updated build instructions and find module to allow GEODE_HOME as env var and GEODE_ROOT cmake var --- BUILDING.md | 12 ++++++++++-- cmake/FindGeode.cmake | 6 +----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 0f845b2..43ffb9a 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -6,20 +6,28 @@ * [Doxygen 8.11](http://www.stack.nl/~dimitri/doxygen/download.html) *(for building source documentation)* * [Apache Geode](http://geode.apache.org/releases/) binaries installed or available to link against - Building requires access to an installation of Geode. By default the value of `GEODE_ROOT` or `GEODE` is used during CMake configuration if either of those shell variables is exported. To explicitly specify the location in which Geode is installed, add `-DGEODE_ROOT=/path/to/geode` to the _initial_ `cmake` execution command. - ### Platform-Specific Prerequisites * [Mac OS X](#mac-os-x) * [Linux](#linux) * [Solaris](#solaris) * [Windows](#windows) +## Setting Path to Geode +Building requires access to an installation of Geode. There are two ways to achieve this: +* Set an environment variable called `GEODE_HOME` that points to your Geode installation path. +* Pass in `GEODE_ROOT` during the CMake configuration step. + * e.g. add `-DGEODE_ROOT=/path/to/geode` to the _initial_ `cmake` execution command. + + + ## Steps to build $ cd <clone> $ mkdir build $ cd build + // configuration step $ cmake .. <platform-specific generator parameters (see below)> + // build step $ cmake --build . -- <platform-specific parallelism parameters (see below)> To explicitly specify the location in which the Native Client will be installed, add `-DCMAKE_INSTALL_PREFIX=/path/to/installation/destination` to this initial `cmake` execution command. diff --git a/cmake/FindGeode.cmake b/cmake/FindGeode.cmake index 3f57104..9e58cf7 100644 --- a/cmake/FindGeode.cmake +++ b/cmake/FindGeode.cmake @@ -22,12 +22,8 @@ if(GEODE_ROOT AND IS_DIRECTORY "${GEODE_ROOT}") set(_GEODE_ROOT_EXPLICIT 1) else() set(_ENV_GEODE_ROOT "") - if(DEFINED ENV{GEODE_ROOT}) - file(TO_CMAKE_PATH "$ENV{GEODE_ROOT}" _ENV_GEODE_ROOT) - elseif(DEFINED ENV{GEODE_HOME}) + if(DEFINED ENV{GEODE_HOME}) file(TO_CMAKE_PATH "$ENV{GEODE_HOME}" _ENV_GEODE_ROOT) - elseif(DEFINED ENV{GEODE}) - file(TO_CMAKE_PATH "$ENV{GEODE}" _ENV_GEODE_ROOT) endif() if(_ENV_GEODE_ROOT AND IS_DIRECTORY "${_ENV_GEODE_ROOT}") set(_GEODE_ROOT "${_ENV_GEODE_ROOT}") -- To stop receiving notification emails like this one, please contact jbarr...@apache.org.