walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fixed CTest configuration files

This commit is contained in:
Antonin Descampe 2011-06-30 13:52:23 +00:00
parent 1837d6efa0
commit b09051fd79
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
June 30, 2011
! [antonin] fixed CTest configuration files
June 3, 2011 June 3, 2011
+ [malaterre] adding partno and numpart info as part of the warning message (issue #69) + [malaterre] adding partno and numpart info as part of the warning message (issue #69)
+ [malaterre] make sure that cmake build system works on debian + [malaterre] make sure that cmake build system works on debian

0
testing/CTestCustom.cmake.in → CMake/CTestCustom.cmake.in
View File

23
CMakeLists.txt
View File

@ -111,8 +111,8 @@ INCLUDE (${OPENJPEG_SOURCE_DIR}/CMake/CheckHaveGetopt.cmake )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup file for setting custom ctest vars # Setup file for setting custom ctest vars
CONFIGURE_FILE( CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/testing/CTestCustom.cmake.in ${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
${CMAKE_BINARY_DIR}/testing/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake
@ONLY @ONLY
) )
@ -201,6 +201,14 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in"
@ONLY @ONLY
) )
#-----------------------------------------------------------------------------
# CDash+CMake : to be updated
OPTION(BUILD_TESTING "Build the tests." OFF)
IF(BUILD_TESTING)
ENABLE_TESTING()
INCLUDE(CTest)
ENDIF(BUILD_TESTING)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build Library # Build Library
INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR}) INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR})
@ -221,21 +229,18 @@ OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(doc)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# CDash+CMake : to be updated # Tests data
OPTION(BUILD_TESTING "Build the tests." OFF)
IF(BUILD_TESTING) IF(BUILD_TESTING)
ENABLE_TESTING()
INCLUDE(CTest)
ENDIF(BUILD_TESTING)
# Adding test with dataset from: # Adding test with dataset from:
# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/ # http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip
# -> wget http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip # -> wget http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip
# http://www.jpeg.org/jpeg2000guide/testimages/testimages.html # http://www.jpeg.org/jpeg2000guide/testimages/testimages.html
# Adding JPEG2000_CONFORMANCE_DATA_ROOT # Adding JPEG2000_CONFORMANCE_DATA_ROOT
FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html
${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages ${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages
$ENV{JPEG2000_CONFORMANCE_DATA_ROOT} $ENV{JPEG2000_CONFORMANCE_DATA_ROOT}
) )
ENDIF(BUILD_TESTING)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# install all targets referenced as OPENJPEGTargets # install all targets referenced as OPENJPEGTargets

0
testing/CTestConfig.cmake → CTestConfig.cmake
View File

1
applications/codec/CMakeLists.txt
View File

@ -133,6 +133,7 @@ foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB})
endforeach(codec_type) endforeach(codec_type)
foreach(codec_type ppm bmp tif tga png) foreach(codec_type ppm bmp tif tga png)
ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext})
SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type})
#if(UNIX) #if(UNIX)
# ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext})
#endif(UNIX) #endif(UNIX)