QPIDIT-97: Reduced required Proton version from 0.18 to 0.17 because RHEL-7 does not have the 0.18 packages yet.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1c4962..c22ed0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@
# Find Proton components
-find_package(Proton 0.18)
+find_package(Proton 0.17)
if (Proton_FOUND)
get_filename_component(PROTON_INSTALL_DIR ${Proton_INCLUDE_DIRS} PATH CACHE PATH "Proton install directory")
message(STATUS "Qpid proton found. Version ${Proton_VERSION} at ${Proton_INCLUDE_DIRS}")
@@ -75,7 +75,7 @@
set (ErrorFlag TRUE)
endif ()
-find_package(ProtonCpp 0.18)
+find_package(ProtonCpp 0.17)
if (ProtonCpp_FOUND)
get_filename_component(PROTON_CPP_INSTALL_DIR ${ProtonCpp_INCLUDE_DIRS} PATH CACHE PATH "ProtonCpp install directory")
message(STATUS "Qpid proton c++ binding found. Version ${ProtonCpp_VERSION} at ${ProtonCpp_INCLUDE_DIRS}")
diff --git a/shims/rhea-js/CMakeLists.txt b/shims/rhea-js/CMakeLists.txt
index d997215..1ffd94b 100644
--- a/shims/rhea-js/CMakeLists.txt
+++ b/shims/rhea-js/CMakeLists.txt
@@ -20,9 +20,9 @@
# Building Rhea requires that node.js is installed.
project(qpid-interop-test-rhea-shims)
-message(STATUS "Searching for Rhea shim build and run requirements...")
-
set(RHEA_DIR "$ENV{HOME}/rhea" CACHE PATH "Path to local Rhea installation")
+message(STATUS "Searching for Rhea shim build and run requirements... RHEA_DIR=${RHEA_DIR}")
+
find_file(RHEA package.json HINTS ${RHEA_DIR} NO_DEFAULT_PATH DOC "Rhea javascript package file")
if (RHEA STREQUAL "RHEA-NOTFOUND")
message(STATUS "No local Rhea directory found, using upstream package.")
