geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [23/50] [abbrv] geode-native git commit: GEODE-2317: FindGeode searches GEODE_HOME environment variable.
Date Thu, 09 Feb 2017 18:09:20 GMT
GEODE-2317: FindGeode searches GEODE_HOME environment variable.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/c2761c0f
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/c2761c0f
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/c2761c0f

Branch: refs/heads/master
Commit: c2761c0ff1b6271fffbac1ebc683b6a6e96d3a35
Parents: fc9f1f6
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Tue Jan 31 21:07:21 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Thu Feb 2 14:29:17 2017 -0800

----------------------------------------------------------------------
 cmake/FindGeode.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/c2761c0f/cmake/FindGeode.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindGeode.cmake b/cmake/FindGeode.cmake
index f563f95..ce12225 100644
--- a/cmake/FindGeode.cmake
+++ b/cmake/FindGeode.cmake
@@ -10,12 +10,14 @@ 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})
+    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}")
-    set(_GEODE_ROOT_EXPLICIT 1)
+    set(_GEODE_ROOT_EXPLICIT 0)
   endif()
   unset(_ENV_GEODE_ROOT)
 endif()


Mime
View raw message