diff options
author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2011-05-25 03:52:22 +0000 |
---|---|---|
committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2011-05-25 03:52:22 +0000 |
commit | e2e1989601b44564688691db2f8a3958653a6176 (patch) | |
tree | eab4e04e7ab763c9ac397d21b1062aa6025e653a /CMakeLists.txt | |
parent | 4e954bd6805a07abc3e68c118ad70ebf4819537e (diff) |
"jpegut"="tjunittest" & "jpgtest"="tjbench"
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@643 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2634c42..388c582 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,22 +193,22 @@ if(WITH_SIMD) add_dependencies(turbojpeg-static simd) endif() -add_executable(jpegut jpegut.c tjutil.c) -target_link_libraries(jpegut turbojpeg) +add_executable(tjunittest tjunittest.c tjutil.c) +target_link_libraries(tjunittest turbojpeg) -add_executable(jpegut-static jpegut.c tjutil.c) -target_link_libraries(jpegut-static turbojpeg-static) +add_executable(tjunittest-static tjunittest.c tjutil.c) +target_link_libraries(tjunittest-static turbojpeg-static) -add_executable(jpgtest jpgtest.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c +add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c wrppm.c) -target_link_libraries(jpgtest turbojpeg jpeg) -set_property(TARGET jpgtest PROPERTY COMPILE_FLAGS +target_link_libraries(tjbench turbojpeg jpeg) +set_property(TARGET tjbench PROPERTY COMPILE_FLAGS "-DBMP_SUPPORTED -DPPM_SUPPORTED") -add_executable(jpgtest-static jpgtest.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c +add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c wrppm.c) -target_link_libraries(jpgtest-static turbojpeg-static jpeg-static) -set_property(TARGET jpgtest-static PROPERTY COMPILE_FLAGS +target_link_libraries(tjbench-static turbojpeg-static jpeg-static) +set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS "-DBMP_SUPPORTED -DPPM_SUPPORTED") add_executable(cjpeg-static cjpeg.c cdjpeg.c rdbmp.c rdgif.c rdppm.c rdswitch.c @@ -248,9 +248,9 @@ add_test(TJUnitTest-yuv ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar -Djava.l add_test(TJUnitTest-bi ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} TJUnitTest -bi) add_test(TJUnitTest-bi-yuv ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} TJUnitTest -bi -yuv) endif() -add_test(jpegut jpegut) -add_test(jpegut-alloc jpegut -alloc) -add_test(jpegut-yuv jpegut -yuv) +add_test(tjunittest tjunittest) +add_test(tjunittest-alloc tjunittest -alloc) +add_test(tjunittest-yuv tjunittest -yuv) add_test(cjpeg-int sharedlib/cjpeg -dct int -outfile testoutint.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm) add_test(cjpeg-int-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/testimgint.jpg testoutint.jpg) add_test(cjpeg-fast sharedlib/cjpeg -dct fast -opt -outfile testoutfst.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm) @@ -308,9 +308,9 @@ endif() add_test(jpegtran-crop sharedlib/jpegtran -crop 120x90+20+50 -transpose -perfect -outfile testoutcrop.jpg ${CMAKE_SOURCE_DIR}/testorig.jpg) add_test(jpegtran-crop-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/testimgcrop.jpg testoutcrop.jpg) -add_test(jpegut-static jpegut-static) -add_test(jpegut-static-alloc jpegut-static -alloc) -add_test(jpegut-static-yuv jpegut-static -yuv) +add_test(tjunittest-static tjunittest-static) +add_test(tjunittest-static-alloc tjunittest-static -alloc) +add_test(tjunittest-static-yuv tjunittest-static -yuv) add_test(cjpeg-static-int cjpeg-static -dct int -outfile testoutint.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm) add_test(cjpeg-static-int-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/testimgint.jpg testoutint.jpg) add_test(cjpeg-static-fast cjpeg-static -dct fast -opt -outfile testoutfst.jpg ${CMAKE_SOURCE_DIR}/testorig.ppm) @@ -409,10 +409,10 @@ configure_file(release/libjpeg-turbo.nsi.in libjpeg-turbo.nsi @ONLY) add_custom_target(installer makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom - cjpeg djpeg jpegtran jpgtest + cjpeg djpeg jpegtran tjbench SOURCES libjpeg-turbo.nsi) -install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom jpgtest +install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom tjbench ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin |