[1.5] Use improved find_path syntax to help cross-compilation setup find openjpeg...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c0736934784e3b1d41e9ef8a98e1e1ab6d9343d..aaa4b22b5a35da0d260f74674c337540b8598351 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,10 +270,9 @@ IF(BUILD_TESTING)
     # They could be found via svn on the OpenJPEG google code project
     # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo) 
     FIND_PATH(OPJ_DATA_ROOT README-OPJ-Data
-      PATHS
-      $ENV{OPJ_DATA_ROOT}
-      ${CMAKE_SOURCE_DIR}/../data
-      ${CMAKE_SOURCE_DIR}/../../data
+      PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../data
+        ${CMAKE_SOURCE_DIR}/../../data
+      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
       )
 
     # Add repository where to find tests