This is an automated email from the ASF dual-hosted git repository.
bbender 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 9df8f88 GEODE-4337: Correct Path Searching in FindGeode module
9df8f88 is described below
commit 9df8f885e7f910291c091d7f9e5114f6018e6cde
Author: Blake Bender <ekalbred...@hotmail.com>
AuthorDate: Wed Nov 7 14:42:01 2018 -0800
GEODE-4337: Correct Path Searching in FindGeode module
- Function execution example includes a jar, so we need Geode to build the
java code
- Geode find module problem was breaking build of examples. It was setting
the 'hints' variable to the value of GEODE_ROOT, which only works if the
'paths' parameter to find_package_handle_standard_args is empty, but it was
always setting paths. Switched it to set one or the other like the
FindGeodeNative find module does, and all is better.
Co-authored-by: Matthew Reddington <mredding...@pivotal.io>
---
cmake/FindGeode.cmake | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/cmake/FindGeode.cmake b/cmake/FindGeode.cmake
index 9e58cf7..3663596 100644
--- a/cmake/FindGeode.cmake
+++ b/cmake/FindGeode.cmake
@@ -35,21 +35,21 @@ endif()
set(_GEODE_HINTS)
if(_GEODE_ROOT)
set(_GEODE_HINTS ${_GEODE_ROOT}/bin)
+else()
+ set(_GEODE_PATHS
+ /geode/bin
+ /apache-geode/bin
+ /usr/geode/bin
+ /usr/apache-geode/bin
+ /usr/local/geode/bin
+ /usr/local/apache-geode/bin
+ /opt/geode/bin
+ /opt/apache-geode/bin
+ /opt/local/geode/bin
+ /opt/local/apache-geode/bin
+ )
endif()
-set(_GEODE_PATHS
- /geode/bin
- /apache-geode/bin
- /usr/geode/bin
- /usr/apache-geode/bin
- /usr/local/geode/bin
- /usr/local/apache-geode/bin
- /opt/geode/bin
- /opt/apache-geode/bin
- /opt/local/geode/bin
- /opt/local/apache-geode/bin
-)
-
if(WIN32)
set(_GEODE_NAMES gfsh.bat)
else()
