diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-06-30 13:52:23 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-06-30 13:52:23 +0000 |
| commit | b09051fd79da1101185a73198aac2d65cf2b2450 (patch) | |
| tree | 497030889cbeb1fc666121e8783eadceb2a5771c /CMakeLists.txt | |
| parent | 1837d6efa0c73b730d4f01921eec8e21d8eaf398 (diff) | |
fixed CTest configuration files
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd73a34d..d8859414 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,8 +111,8 @@ INCLUDE (${OPENJPEG_SOURCE_DIR}/CMake/CheckHaveGetopt.cmake ) #----------------------------------------------------------------------------- # Setup file for setting custom ctest vars CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/testing/CTestCustom.cmake.in - ${CMAKE_BINARY_DIR}/testing/CTestCustom.cmake + ${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in + ${CMAKE_BINARY_DIR}/CTestCustom.cmake @ONLY ) @@ -202,6 +202,14 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in" ) #----------------------------------------------------------------------------- +# CDash+CMake : to be updated +OPTION(BUILD_TESTING "Build the tests." OFF) +IF(BUILD_TESTING) + ENABLE_TESTING() + INCLUDE(CTest) +ENDIF(BUILD_TESTING) + +#----------------------------------------------------------------------------- # Build Library INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR}) ADD_SUBDIRECTORY(libopenjpeg) @@ -221,21 +229,18 @@ OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF) ADD_SUBDIRECTORY(doc) #----------------------------------------------------------------------------- -# CDash+CMake : to be updated -OPTION(BUILD_TESTING "Build the tests." OFF) +# Tests data IF(BUILD_TESTING) - ENABLE_TESTING() - INCLUDE(CTest) -ENDIF(BUILD_TESTING) # Adding test with dataset from: -# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/ -# -> wget http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip +# http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip +# -> wget http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip # http://www.jpeg.org/jpeg2000guide/testimages/testimages.html # Adding JPEG2000_CONFORMANCE_DATA_ROOT FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html ${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages $ENV{JPEG2000_CONFORMANCE_DATA_ROOT} ) +ENDIF(BUILD_TESTING) #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets |