diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-08-22 10:42:32 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-08-22 10:42:32 +0000 |
| commit | 9ec5e8cf9ac5979f69097efe8ccf01152283fe9e (patch) | |
| tree | 34b5016c289a86f22b68c5ad0e166c72ae27df56 | |
| parent | 4c9acc22b83f7835373cd3d1243897cd57428120 (diff) | |
updated INSTALL files, fixed a bug in CMakeLists.txt that prevented finding the data directory
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | INSTALL | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dab7393..513e9cdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,7 +250,7 @@ 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}/../opj-data) + PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../data) SET (REF_DECODER_BIN_PATH "NOT-FOUND" CACHE PATH "Single directory where find the reference encoder binaries to enable encoding test suite.") MARK_AS_ADVANCED(REF_DECODER_BIN_PATH) @@ -87,10 +87,13 @@ Main available cmake flags: * To build the JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF') * To build the JPIP library and utilities: '-DBUILD_JPIP:bool=on' (default: 'OFF') * To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG): - cmake . -DBUILD_TESTING:BOOL=ON + cmake . -DBUILD_TESTING:BOOL=ON -DOPJ_DATA_ROOT:PATH='path/to/the/data/directory' make make Experimental - Note : JPEG2000 test files are available with 'svn checkout http://openjpeg.googlecode.com/svn/data' (about 70 Mo) + Note : JPEG2000 test files are available with 'svn checkout http://openjpeg.googlecode.com/svn/data' (about 70 Mo). + If '-DOPJ_DATA_ROOT:PATH' option is omitted, test files will be automatically searched in '${CMAKE_SOURCE_DIR}/../data', + corresponding to the location of the data directory when compiling from the trunk (and assuming the data directory has + been checked out of course). MACOSX ------ |