Build: Reformat lines longer than 80 columns ...

... to ensure that no function argument starts beyond the 80th column.
This commit is contained in:
DRC
2024-01-30 15:40:51 -05:00
parent 36c51dd3eb
commit d59b1a3bce
2 changed files with 34 additions and 15 deletions

View File

@@ -222,25 +222,38 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
boolean_number(ENABLE_SHARED) boolean_number(ENABLE_SHARED)
option(ENABLE_STATIC "Build static libraries" TRUE) option(ENABLE_STATIC "Build static libraries" TRUE)
boolean_number(ENABLE_STATIC) boolean_number(ENABLE_STATIC)
option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE) option(REQUIRE_SIMD
"Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)"
FALSE)
boolean_number(REQUIRE_SIMD) boolean_number(REQUIRE_SIMD)
option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE) option(WITH_ARITH_DEC
"Include arithmetic decoding support when emulating the libjpeg v6b API/ABI"
TRUE)
boolean_number(WITH_ARITH_DEC) boolean_number(WITH_ARITH_DEC)
option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" TRUE) option(WITH_ARITH_ENC
"Include arithmetic encoding support when emulating the libjpeg v6b API/ABI"
TRUE)
boolean_number(WITH_ARITH_ENC) boolean_number(WITH_ARITH_ENC)
if(CMAKE_C_COMPILER_ABI MATCHES "ELF X32") if(CMAKE_C_COMPILER_ABI MATCHES "ELF X32")
set(WITH_JAVA 0) set(WITH_JAVA 0)
else() else()
option(WITH_JAVA "Build Java wrapper for the TurboJPEG API library (implies ENABLE_SHARED=1)" FALSE) option(WITH_JAVA
"Build Java wrapper for the TurboJPEG API library (implies ENABLE_SHARED=1)"
FALSE)
boolean_number(WITH_JAVA) boolean_number(WITH_JAVA)
endif() endif()
option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)" FALSE) option(WITH_JPEG7
"Emulate libjpeg v7 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)"
FALSE)
boolean_number(WITH_JPEG7) boolean_number(WITH_JPEG7)
option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)" FALSE) option(WITH_JPEG8
"Emulate libjpeg v8 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)"
FALSE)
boolean_number(WITH_JPEG8) boolean_number(WITH_JPEG8)
option(WITH_SIMD "Include SIMD extensions, if available for this platform" TRUE) option(WITH_SIMD "Include SIMD extensions, if available for this platform" TRUE)
boolean_number(WITH_SIMD) boolean_number(WITH_SIMD)
option(WITH_TURBOJPEG "Include the TurboJPEG API library and associated test programs" TRUE) option(WITH_TURBOJPEG
"Include the TurboJPEG API library and associated test programs" TRUE)
boolean_number(WITH_TURBOJPEG) boolean_number(WITH_TURBOJPEG)
option(WITH_FUZZ "Build fuzz targets" FALSE) option(WITH_FUZZ "Build fuzz targets" FALSE)
@@ -521,7 +534,8 @@ if(MSVC)
else() else()
set(THREAD_LOCAL "__thread") set(THREAD_LOCAL "__thread")
endif() endif()
check_c_source_compiles("${THREAD_LOCAL} int i; int main(void) { i = 0; return i; }" HAVE_THREAD_LOCAL) check_c_source_compiles("${THREAD_LOCAL} int i; int main(void) { i = 0; return i; }"
HAVE_THREAD_LOCAL)
if(HAVE_THREAD_LOCAL) if(HAVE_THREAD_LOCAL)
message(STATUS "THREAD_LOCAL = ${THREAD_LOCAL}") message(STATUS "THREAD_LOCAL = ${THREAD_LOCAL}")
else() else()
@@ -1079,8 +1093,8 @@ foreach(libtype ${TEST_LIBTYPES})
set(MD5_PPM_444_TILE 87bd58005eec73f0f313c8e38d0d793c) set(MD5_PPM_444_TILE 87bd58005eec73f0f313c8e38d0d793c)
endif() endif()
# Test compressing from/decompressing to an arbitrary subregion of a larger # Test compressing from/decompressing to an arbitrary subregion of a
# image buffer # larger image buffer
add_test(${tjbench}-${libtype}-tile-cp add_test(${tjbench}-${libtype}-tile-cp
${CMAKE_COMMAND} -E copy_if_different ${TESTIMAGES}/testorig.ppm ${CMAKE_COMMAND} -E copy_if_different ${TESTIMAGES}/testorig.ppm
${testout}_tile.ppm) ${testout}_tile.ppm)

View File

@@ -56,7 +56,8 @@ if(MSYS)
endif() endif()
add_custom_target(javadoc COMMAND add_custom_target(javadoc COMMAND
javadoc -notimestamp -d ${CMAKE_CURRENT_SOURCE_DIR}/doc -sourcepath ${CMAKE_CURRENT_SOURCE_DIR} org.libjpegturbo.turbojpeg) javadoc -notimestamp -d ${CMAKE_CURRENT_SOURCE_DIR}/doc
-sourcepath ${CMAKE_CURRENT_SOURCE_DIR} org.libjpegturbo.turbojpeg)
set(JAVACLASSPATH ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/turbojpeg-java.dir) set(JAVACLASSPATH ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/turbojpeg-java.dir)
if(Java_VERSION_MAJOR GREATER 9) if(Java_VERSION_MAJOR GREATER 9)
add_custom_target(javah add_custom_target(javah
@@ -68,10 +69,14 @@ if(Java_VERSION_MAJOR GREATER 9)
${CMAKE_CURRENT_SOURCE_DIR}/org/libjpegturbo/turbojpeg/TJTransformer.java) ${CMAKE_CURRENT_SOURCE_DIR}/org/libjpegturbo/turbojpeg/TJTransformer.java)
else() else()
add_custom_target(javah add_custom_target(javah
COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH} org.libjpegturbo.turbojpeg.TJ COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH}
COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH} org.libjpegturbo.turbojpeg.TJCompressor org.libjpegturbo.turbojpeg.TJ
COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH} org.libjpegturbo.turbojpeg.TJDecompressor COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH}
COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH} org.libjpegturbo.turbojpeg.TJTransformer) org.libjpegturbo.turbojpeg.TJCompressor
COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH}
org.libjpegturbo.turbojpeg.TJDecompressor
COMMAND javah -d ${CMAKE_CURRENT_SOURCE_DIR} -classpath ${JAVACLASSPATH}
org.libjpegturbo.turbojpeg.TJTransformer)
endif() endif()
if(NOT DEFINED CMAKE_INSTALL_DEFAULT_JAVADIR) if(NOT DEFINED CMAKE_INSTALL_DEFAULT_JAVADIR)