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

Reactivate ctest

This commit is contained in:
Mathieu Malaterre 2010-05-26 09:45:12 +00:00
parent a02c683572
commit a1b6f1e096
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -99,8 +99,8 @@ ENDIF(BUILD_DOCUMENTATION)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# For openjpeg team if they ever want Dart+CMake # For openjpeg team if they ever want Dart+CMake
IF(OPENJPEG_STANDALONE) IF(OPENJPEG_STANDALONE)
INCLUDE(Dart) INCLUDE(CTest)
MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH) #MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
IF(BUILD_TESTING) IF(BUILD_TESTING)
ENABLE_TESTING() ENABLE_TESTING()
SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard") SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard")
@ -110,8 +110,8 @@ ENDIF(OPENJPEG_STANDALONE)
# Adding test with dataset from: # Adding test with dataset from:
# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/ # http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
# -> wget http://www.crc.ricoh.com/~gormish/jpeg2000conformance/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

3
codec/CMakeLists.txt
View File

@ -38,11 +38,12 @@ IF(NOT BUILD_SHARED_LIBS)
ENDIF(NOT BUILD_SHARED_LIBS) ENDIF(NOT BUILD_SHARED_LIBS)
FIND_PACKAGE(TIFF REQUIRED) FIND_PACKAGE(TIFF REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
# Loop over all executables: # Loop over all executables:
FOREACH(exe j2k_to_image image_to_j2k) FOREACH(exe j2k_to_image image_to_j2k)
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES}) TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES} ${PNG_LIBRARIES})
ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
# calling those exe without option will make them fail always: # calling those exe without option will make them fail always:
SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE) SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)