From 40dc3c517fe66076e9aa94cde03b5cf12555c847 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 13 Nov 2014 17:14:53 -0800
Subject: [PATCH] changes for android to find GLM and OpenSSL

---
 CMakeLists.txt                            |  3 +--
 cmake/macros/HifiLibrarySearchHints.cmake |  4 ++++
 cmake/modules/FindGLM.cmake               |  3 ++-
 cmake/modules/FindOpenSSL.cmake           | 11 +++++++++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96c8ffb8bf..4aa129541d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,7 @@ endif(WIN32)
 
 if (ANDROID)
   if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
-    set(QT_CMAKE_PREFIX_PATH $ENV{ANDROID_QT_CMAKE_PREFIX_PATH})
-    message(${QT_CMAKE_PREFIX_PATH})
+    set(QT_CMAKE_PREFIX_PATH $ENV{HIFI_ANDROID}/qt/5.3/android_armv7/lib/cmake)
   endif ()
 elseif ()
   if (NOT QT_CMAKE_PREFIX_PATH)
diff --git a/cmake/macros/HifiLibrarySearchHints.cmake b/cmake/macros/HifiLibrarySearchHints.cmake
index f56b3134d8..b97fa47ad1 100644
--- a/cmake/macros/HifiLibrarySearchHints.cmake
+++ b/cmake/macros/HifiLibrarySearchHints.cmake
@@ -16,6 +16,10 @@ macro(HIFI_LIBRARY_SEARCH_HINTS LIBRARY_FOLDER)
     set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()
   
+  if (ANDROID AND DEFINED ENV{HIFI_ANDROID})
+    set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "$ENV{HIFI_ANDROID}/${LIBRARY_FOLDER}")
+  endif ()
+  
   if (DEFINED ENV{${LIBRARY_PREFIX}_ROOT_DIR})
     set(${LIBRARY_PREFIX}_SEARCH_DIRS "${${LIBRARY_PREFIX}_SEARCH_DIRS}" "$ENV{${LIBRARY_PREFIX}_ROOT_DIR}")
   endif ()
diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
index 852ebbc15e..1c903f98d8 100644
--- a/cmake/modules/FindGLM.cmake
+++ b/cmake/modules/FindGLM.cmake
@@ -18,7 +18,8 @@ include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("glm")
 
 # locate header
-find_path(GLM_INCLUDE_DIR "glm/glm.hpp" HINTS ${GLM_SEARCH_DIRS})
+find_path(GLM_INCLUDE_DIR "glm/glm.hpp" HINTS ${GLM_SEARCH_DIRS} NO_CMAKE_FIND_ROOT_PATH)
+
 set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/modules/FindOpenSSL.cmake b/cmake/modules/FindOpenSSL.cmake
index 16db0a16f0..18633b4301 100644
--- a/cmake/modules/FindOpenSSL.cmake
+++ b/cmake/modules/FindOpenSSL.cmake
@@ -52,7 +52,10 @@ else ()
   set(_OPENSSL_ROOT_HINTS_AND_PATHS ${OPENSSL_SEARCH_DIRS})
 endif ()
 
-find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_INCLUDEDIR} PATH_SUFFIXES include)
+find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_INCLUDEDIR} 
+  PATH_SUFFIXES include
+  NO_CMAKE_FIND_ROOT_PATH
+)
 
 if (WIN32 AND NOT CYGWIN)
   if (MSVC)
@@ -131,9 +134,13 @@ else()
 
   find_library(OPENSSL_SSL_LIBRARY NAMES ssl ssleay32 ssleay32MD HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR}
     PATH_SUFFIXES lib
+    NO_CMAKE_FIND_ROOT_PATH
   )
 
-  find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR} PATH_SUFFIXES lib)
+  find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_LIBDIR} 
+    PATH_SUFFIXES lib
+    NO_CMAKE_FIND_ROOT_PATH
+  )
 
   mark_as_advanced(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)