From af2be2d456b289e09fdd2bd06b438bad6def7902 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Tue, 4 Mar 2014 08:29:53 +0000 Subject: [PATCH] [1.5] Use improved find_path syntax to help cross-compilation setup find openjpeg data root --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c073693..aaa4b22b 100644 --- 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