[libpng17] Make cmake install pnglibconf.h; rename some tests to be

similar to the names generated by "configure"
This commit is contained in:
Glenn Randers-Pehrson
2016-02-09 08:54:17 -06:00
parent af9ad9545d
commit 3fb14ea53b

View File

@@ -330,13 +330,13 @@ endif(NOT AWK)
set(libpng_public_hdrs set(libpng_public_hdrs
png.h png.h
pngconf.h pngconf.h
"${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
) )
set(libpng_private_hdrs set(libpng_private_hdrs
pngpriv.h pngpriv.h
pngdebug.h pngdebug.h
pnginfo.h pnginfo.h
pngstruct.h pngstruct.h
"${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
pngchunk.h pngchunk.h
) )
if(AWK) if(AWK)
@@ -529,11 +529,11 @@ if(PNG_TESTS AND PNG_SHARED)
COMMAND pngvalid OPTIONS --gamma-alpha-mode) COMMAND pngvalid OPTIONS --gamma-alpha-mode)
png_add_test(NAME pngvalid-gamma-background png_add_test(NAME pngvalid-gamma-background
COMMAND pngvalid OPTIONS --gamma-background) COMMAND pngvalid OPTIONS --gamma-background)
png_add_test(NAME pngvalid-gamma-alpha-mode-expand16 png_add_test(NAME pngvalid-gamma-expand16-alpha-mode
COMMAND pngvalid OPTIONS --gamma-alpha-mode --expand16) COMMAND pngvalid OPTIONS --gamma-alpha-mode --expand16)
png_add_test(NAME pngvalid-gamma-background-expand16 png_add_test(NAME pngvalid-gamma-expand16-background
COMMAND pngvalid OPTIONS --gamma-background --expand16) COMMAND pngvalid OPTIONS --gamma-background --expand16)
png_add_test(NAME pngvalid-gamma-transform-expand16 png_add_test(NAME pngvalid-gamma-expand16-transform
COMMAND pngvalid OPTIONS --gamma-transform --expand16) COMMAND pngvalid OPTIONS --gamma-transform --expand16)
png_add_test(NAME pngvalid-gamma-sbit png_add_test(NAME pngvalid-gamma-sbit
COMMAND pngvalid OPTIONS --gamma-sbit) COMMAND pngvalid OPTIONS --gamma-sbit)
@@ -541,11 +541,11 @@ if(PNG_TESTS AND PNG_SHARED)
COMMAND pngvalid OPTIONS --gamma-threshold) COMMAND pngvalid OPTIONS --gamma-threshold)
png_add_test(NAME pngvalid-gamma-transform png_add_test(NAME pngvalid-gamma-transform
COMMAND pngvalid OPTIONS --gamma-transform) COMMAND pngvalid OPTIONS --gamma-transform)
png_add_test(NAME pngvalid-standard-progressive-read-interlace png_add_test(NAME pngvalid-progressive-interlace-standard
COMMAND pngvalid OPTIONS --standard --progressive-read --interlace) COMMAND pngvalid OPTIONS --standard --progressive-read --interlace)
png_add_test(NAME pngvalid-size-progressive-read png_add_test(NAME pngvalid-progressive-size
COMMAND pngvalid OPTIONS --size --progressive-read) COMMAND pngvalid OPTIONS --size --progressive-read)
png_add_test(NAME pngvalid-standard-progressive-read png_add_test(NAME pngvalid-progressive-standard
COMMAND pngvalid OPTIONS --standard --progressive-read) COMMAND pngvalid OPTIONS --standard --progressive-read)
png_add_test(NAME pngvalid-standard png_add_test(NAME pngvalid-standard
COMMAND pngvalid OPTIONS --standard) COMMAND pngvalid OPTIONS --standard)