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

This commit is contained in:
Mathieu Malaterre 2014-03-04 08:29:53 +00:00
parent 96dba34ddc
commit af2be2d456
1 changed files with 3 additions and 4 deletions

View File

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