cmake: Run cmake-format 0.5.1 on all CMake files. BUG=b/133175488 Change-Id: Ib7416fdc8af0bd228de4eb344384bf72930865f7
diff --git a/.cmake-format.py b/.cmake-format.py index aa7354c..7b0e4f0 100644 --- a/.cmake-format.py +++ b/.cmake-format.py
@@ -1,13 +1,11 @@ -# Generated with cmake-format 0.3.6 +# Generated with cmake-format 0.5.1 # How wide to allow formatted cmake files line_width = 80 # How many spaces to tab for indent tab_size = 2 -# If arglists are longer than this, break them always. This introduces some -# interesting effects with complicated 'if' statements. However, we want file -# lists to look reasonable. Try to strike a balance. +# If arglists are longer than this, break them always max_subargs_per_line = 10 # If true, separate flow control names from their parentheses with a space @@ -21,10 +19,10 @@ dangle_parens = False # What character to use for bulleted lists -bullet_char = u'*' +bullet_char = '*' # What character to use as punctuation after numerals in an enumerated list -enum_char = u'.' +enum_char = '.' # What style line endings to use in the output. line_ending = u'unix' @@ -32,6 +30,9 @@ # Format command names consistently as 'lower' or 'upper' case command_case = u'lower' +# Format keywords consistently as 'lower' or 'upper' case +keyword_case = u'unchanged' + # Specify structure for custom cmake functions additional_commands = { "foo": { @@ -46,3 +47,56 @@ } } } + +# A list of command names which should always be wrapped +always_wrap = [] + +# Specify the order of wrapping algorithms during successive reflow attempts +algorithm_order = [0, 1, 2, 3, 4] + +# If true, the argument lists which are known to be sortable will be sorted +# lexicographicall +autosort = False + +# enable comment markup parsing and reflow +enable_markup = True + +# If comment markup is enabled, don't reflow the first comment block in +# eachlistfile. Use this to preserve formatting of your +# copyright/licensestatements. +first_comment_is_literal = False + +# If comment markup is enabled, don't reflow any comment block which matchesthis +# (regex) pattern. Default is `None` (disabled). +literal_comment_pattern = None + +# Regular expression to match preformat fences in comments +# default=r'^\s*([`~]{3}[`~]*)(.*)$' +fence_pattern = u'^\\s*([`~]{3}[`~]*)(.*)$' + +# Regular expression to match rulers in comments +# default=r'^\s*[^\w\s]{3}.*[^\w\s]{3}$' +ruler_pattern = u'^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$' + +# If true, emit the unicode byte-order mark (BOM) at the start of the file +emit_byteorder_mark = False + +# If a comment line starts with at least this many consecutive hash characters, +# then don't lstrip() them off. This allows for lazy hash rulers where the first +# hash char is not separated by space +hashruler_min_length = 10 + +# If true, then insert a space between the first hash char and remaining hash +# chars in a hash ruler, and normalize it's length to fill the column +canonicalize_hashrulers = True + +# Specify the encoding of the input file. Defaults to utf-8. +input_encoding = u'utf-8' + +# Specify the encoding of the output file. Defaults to utf-8. Note that cmake +# only claims to support utf-8 so be careful when using anything else +output_encoding = u'utf-8' + +# A dictionary containing any per-command configuration overrides. Currently +# only `command_case` is supported. +per_command = {}
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c35a0f..c767ae3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -12,7 +12,8 @@ if(NOT EMSCRIPTEN) if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" + set(CMAKE_BUILD_TYPE + "Release" CACHE "Build type: Debug, Release, RelWithDebInfo or MinSizeRel" STRING FORCE) endif() @@ -24,11 +25,12 @@ set(AOM_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}") if("${AOM_ROOT}" STREQUAL "${AOM_CONFIG_DIR}") - message(FATAL_ERROR - "Building from within the aom source tree is not supported.\n" - "Hint: Run these commands\n" "$ rm -rf CMakeCache.txt CMakeFiles\n" - "$ mkdir -p ../aom_build\n" "$ cd ../aom_build\n" - "And re-run CMake from the aom_build directory.") + message( + FATAL_ERROR "Building from within the aom source tree is not supported.\n" + "Hint: Run these commands\n" + "$ rm -rf CMakeCache.txt CMakeFiles\n" + "$ mkdir -p ../aom_build\n" "$ cd ../aom_build\n" + "And re-run CMake from the aom_build directory.") endif() include("${AOM_ROOT}/build/cmake/aom_configure.cmake") @@ -176,15 +178,18 @@ -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPERL_EXECUTABLE=${PERL_EXECUTABLE} -P "${AOM_ROOT}/build/cmake/version.cmake" - COMMENT "Writing aom_version.h" VERBATIM) + COMMENT "Writing aom_version.h" + VERBATIM) add_custom_target(aom_version_check - COMMAND ${CMAKE_COMMAND} -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} + COMMAND ${CMAKE_COMMAND} + -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} -DAOM_ROOT=${AOM_ROOT} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPERL_EXECUTABLE=${PERL_EXECUTABLE} -P "${AOM_ROOT}/build/cmake/version.cmake" - COMMENT "Updating version info if necessary." VERBATIM) + COMMENT "Updating version info if necessary." + VERBATIM) add_dependencies(aom_version aom_version_check) # TODO(tomfinegan): Move rtcd target setup where it belongs for each rtcd @@ -236,7 +241,7 @@ # other pieces of the util support without defining usage_exit(). file(WRITE "${AOM_GEN_SRC_DIR}/usage_exit.c" "void usage_exit(void) {}") file(WRITE "${AOM_GEN_SRC_DIR}/usage_exit.cc" - "extern \"C\" void usage_exit(void) {}") + "extern \"C\" void usage_exit(void) {}") # # Application and application support targets. @@ -255,31 +260,31 @@ if((CONFIG_AV1_DECODER OR CONFIG_AV1_ENCODER) AND ENABLE_EXAMPLES) add_executable(resize_util "${AOM_ROOT}/examples/resize_util.c" - $<TARGET_OBJECTS:aom_common_app_util>) + $<TARGET_OBJECTS:aom_common_app_util>) list(APPEND AOM_APP_TARGETS resize_util) endif() if(CONFIG_AV1_DECODER AND ENABLE_EXAMPLES) add_executable(aomdec "${AOM_ROOT}/apps/aomdec.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) add_executable(decode_to_md5 "${AOM_ROOT}/examples/decode_to_md5.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) add_executable(decode_with_drops "${AOM_ROOT}/examples/decode_with_drops.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) add_executable(simple_decoder "${AOM_ROOT}/examples/simple_decoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) add_executable(scalable_decoder "${AOM_ROOT}/examples/scalable_decoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) if(CONFIG_ANALYZER) add_executable(analyzer "${AOM_ROOT}/examples/analyzer.cc" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) target_link_libraries(analyzer ${AOM_LIB_LINK_TYPE} ${wxWidgets_LIBRARIES}) list(APPEND AOM_APP_TARGETS analyzer) list(APPEND AOM_DECODER_EXAMPLE_TARGETS analyzer) @@ -287,8 +292,8 @@ if(CONFIG_INSPECTION) add_executable(inspect "${AOM_ROOT}/examples/inspect.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) list(APPEND AOM_DECODER_EXAMPLE_TARGETS inspect) if(EMSCRIPTEN) @@ -315,8 +320,8 @@ endif() # Maintain a list of decoder example targets. - list(APPEND AOM_DECODER_EXAMPLE_TARGETS aomdec decode_to_md5 - decode_with_drops scalable_decoder simple_decoder) + list(APPEND AOM_DECODER_EXAMPLE_TARGETS aomdec decode_to_md5 decode_with_drops + scalable_decoder simple_decoder) # Add decoder examples to the app targets list. list(APPEND AOM_APP_TARGETS ${AOM_DECODER_EXAMPLE_TARGETS}) @@ -325,27 +330,27 @@ if(CONFIG_AV1_ENCODER) if(ENABLE_EXAMPLES) add_executable(aomenc "${AOM_ROOT}/apps/aomenc.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util> - $<TARGET_OBJECTS:aom_encoder_stats>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util> + $<TARGET_OBJECTS:aom_encoder_stats>) add_executable(lossless_encoder "${AOM_ROOT}/examples/lossless_encoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) add_executable(set_maps "${AOM_ROOT}/examples/set_maps.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) add_executable(simple_encoder "${AOM_ROOT}/examples/simple_encoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) add_executable(twopass_encoder "${AOM_ROOT}/examples/twopass_encoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) add_executable(noise_model "${AOM_ROOT}/examples/noise_model.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) add_executable(scalable_encoder "${AOM_ROOT}/examples/scalable_encoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) # Maintain a list of encoder example targets. list(APPEND AOM_ENCODER_EXAMPLE_TARGETS aomenc lossless_encoder noise_model @@ -358,7 +363,8 @@ # TODO(tomfinegan): Sort out why a simple link command with # aom_entropy_optimizer.c won't work on macos, but dragging in all the # helper machinery allows the link to succeed. - add_executable(aom_entropy_optimizer "${AOM_GEN_SRC_DIR}/usage_exit.c" + add_executable(aom_entropy_optimizer + "${AOM_GEN_SRC_DIR}/usage_exit.c" "${AOM_ROOT}/tools/aom_entropy_optimizer.c" $<TARGET_OBJECTS:aom_common_app_util> $<TARGET_OBJECTS:aom_encoder_app_util>) @@ -385,11 +391,11 @@ if(ENABLE_TOOLS) if(CONFIG_AV1_DECODER) add_executable(dump_obu "${AOM_GEN_SRC_DIR}/usage_exit.cc" - "${AOM_ROOT}/tools/dump_obu.cc" - "${AOM_ROOT}/tools/obu_parser.cc" - "${AOM_ROOT}/tools/obu_parser.h" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + "${AOM_ROOT}/tools/dump_obu.cc" + "${AOM_ROOT}/tools/obu_parser.cc" + "${AOM_ROOT}/tools/obu_parser.h" + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) list(APPEND AOM_TOOL_TARGETS dump_obu) list(APPEND AOM_APP_TARGETS dump_obu) @@ -404,16 +410,16 @@ if(ENABLE_EXAMPLES AND CONFIG_AV1_DECODER AND CONFIG_AV1_ENCODER) add_executable(aom_cx_set_ref "${AOM_ROOT}/examples/aom_cx_set_ref.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) list(APPEND AOM_EXAMPLE_TARGETS aom_cx_set_ref) list(APPEND AOM_APP_TARGETS aom_cx_set_ref) endif() if(ENABLE_EXAMPLES AND CONFIG_AV1_ENCODER) add_executable(lightfield_encoder "${AOM_ROOT}/examples/lightfield_encoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_encoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_encoder_app_util>) list(APPEND AOM_EXAMPLE_TARGETS lightfield_encoder) list(APPEND AOM_APP_TARGETS lightfield_encoder) endif() @@ -429,8 +435,8 @@ if(ENABLE_EXAMPLES AND CONFIG_AV1_DECODER) add_executable(lightfield_decoder "${AOM_ROOT}/examples/lightfield_decoder.c" - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:aom_decoder_app_util>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:aom_decoder_app_util>) list(APPEND AOM_EXAMPLE_TARGETS lightfield_decoder) list(APPEND AOM_APP_TARGETS lightfield_decoder) endif() @@ -591,7 +597,8 @@ endif() add_custom_target(dist - COMMAND ${CMAKE_COMMAND} -DAOM_ROOT=${AOM_ROOT} + COMMAND ${CMAKE_COMMAND} + -DAOM_ROOT=${AOM_ROOT} -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} -DAOM_DIST_DIR=${AOM_DIST_DIR} -DAOM_DIST_APPS="${AOM_DIST_APPS}" @@ -612,8 +619,8 @@ # Collect all variables containing libaom source files. get_cmake_property(all_cmake_vars VARIABLES) foreach(var ${all_cmake_vars}) - if("${var}" MATCHES "SOURCES$\|_INTRIN_\|_ASM_" AND NOT "${var}" MATCHES - "_APP_\|DOXYGEN\|LIBWEBM\|LIBYUV\|_PKG_\|TEST") + if("${var}" MATCHES "SOURCES$\|_INTRIN_\|_ASM_" + AND NOT "${var}" MATCHES "_APP_\|DOXYGEN\|LIBWEBM\|LIBYUV\|_PKG_\|TEST") list(APPEND aom_source_vars ${var}) endif() endforeach() @@ -632,9 +639,8 @@ endforeach() endforeach() -file(APPEND - "${libaom_srcs_txt_file}" - "# Files below this line are generated by the libaom build system.\n") +file(APPEND "${libaom_srcs_txt_file}" + "# Files below this line are generated by the libaom build system.\n") foreach(aom_source_var ${aom_source_vars}) foreach(file ${${aom_source_var}}) if("${file}" MATCHES "${AOM_CONFIG_DIR}") @@ -667,15 +673,14 @@ endif() endforeach() -file(APPEND - "${libaom_srcs_gni_file}" - "\n# Files below this line are generated by the libaom build system.\n") +file(APPEND "${libaom_srcs_gni_file}" + "\n# Files below this line are generated by the libaom build system.\n") foreach(aom_source_var ${aom_source_vars}) if("${${aom_source_var}}" MATCHES "${AOM_CONFIG_DIR}") string(TOLOWER ${aom_source_var} aom_source_var_lowercase) file(APPEND "${libaom_srcs_gni_file}" - "\n${aom_source_var_lowercase}_gen = [\n") + "\n${aom_source_var_lowercase}_gen = [\n") endif() foreach(file ${${aom_source_var}}) if(NOT "${file}" MATCHES "${AOM_ROOT}")
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake index 4829ee7..a772731 100644 --- a/aom_dsp/aom_dsp.cmake +++ b/aom_dsp/aom_dsp.cmake
@@ -104,8 +104,7 @@ "${AOM_ROOT}/aom_dsp/x86/avg_intrin_avx2.c" "${AOM_ROOT}/aom_dsp/x86/bitdepth_conversion_avx2.h") -list(APPEND AOM_DSP_COMMON_INTRIN_NEON - "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c" +list(APPEND AOM_DSP_COMMON_INTRIN_NEON "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c" "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c" "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c" "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c" @@ -239,8 +238,7 @@ "${AOM_ROOT}/aom_dsp/x86/obmc_sad_sse4.c" "${AOM_ROOT}/aom_dsp/x86/obmc_variance_sse4.c") - list(APPEND AOM_DSP_ENCODER_INTRIN_NEON - "${AOM_ROOT}/aom_dsp/arm/sad4d_neon.c" + list(APPEND AOM_DSP_ENCODER_INTRIN_NEON "${AOM_ROOT}/aom_dsp/arm/sad4d_neon.c" "${AOM_ROOT}/aom_dsp/arm/sad_neon.c" "${AOM_ROOT}/aom_dsp/arm/subpel_variance_neon.c" "${AOM_ROOT}/aom_dsp/arm/variance_neon.c")
diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake index 6272fc0..8897fff 100644 --- a/aom_ports/aom_ports.cmake +++ b/aom_ports/aom_ports.cmake
@@ -64,8 +64,8 @@ if(aom_ports_has_symbols) target_sources(aom_ports PRIVATE ${AOM_PORTS_INCLUDES}) - if("${AOM_TARGET_CPU}" STREQUAL "x86" OR "${AOM_TARGET_CPU}" STREQUAL - "x86_64") + if("${AOM_TARGET_CPU}" STREQUAL "x86" + OR "${AOM_TARGET_CPU}" STREQUAL "x86_64") target_sources(aom_ports PRIVATE ${AOM_PORTS_INCLUDES_X86}) endif() @@ -73,8 +73,8 @@ else() target_sources(aom PRIVATE ${AOM_PORTS_INCLUDES}) - if("${AOM_TARGET_CPU}" STREQUAL "x86" OR "${AOM_TARGET_CPU}" STREQUAL - "x86_64") + if("${AOM_TARGET_CPU}" STREQUAL "x86" + OR "${AOM_TARGET_CPU}" STREQUAL "x86_64") target_sources(aom PRIVATE ${AOM_PORTS_INCLUDES_X86}) endif() endif()
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index d8d5900..05c07f0 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -171,10 +171,10 @@ ON) # x86/x86_64 assembly/intrinsics flags. -set_aom_option_var(ENABLE_MMX - "Enables MMX optimizations on x86/x86_64 targets." ON) -set_aom_option_var(ENABLE_SSE - "Enables SSE optimizations on x86/x86_64 targets." ON) +set_aom_option_var(ENABLE_MMX "Enables MMX optimizations on x86/x86_64 targets." + ON) +set_aom_option_var(ENABLE_SSE "Enables SSE optimizations on x86/x86_64 targets." + ON) set_aom_option_var(ENABLE_SSE2 "Enables SSE2 optimizations on x86/x86_64 targets." ON) set_aom_option_var(ENABLE_SSE3 @@ -185,7 +185,7 @@ "Enables SSE4_1 optimizations on x86/x86_64 targets." ON) set_aom_option_var(ENABLE_SSE4_2 "Enables SSE4_2 optimizations on x86/x86_64 targets." ON) -set_aom_option_var(ENABLE_AVX - "Enables AVX optimizations on x86/x86_64 targets." ON) +set_aom_option_var(ENABLE_AVX "Enables AVX optimizations on x86/x86_64 targets." + ON) set_aom_option_var(ENABLE_AVX2 "Enables AVX2 optimizations on x86/x86_64 targets." ON)
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake index cb64713..f84e39c 100644 --- a/build/cmake/aom_configure.cmake +++ b/build/cmake/aom_configure.cmake
@@ -36,24 +36,24 @@ # Detect target CPU. if(NOT AOM_TARGET_CPU) - if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR - "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") + if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" + OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) set(AOM_TARGET_CPU "x86") elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8) set(AOM_TARGET_CPU "x86_64") else() - message(FATAL_ERROR - "--- Unexpected pointer size (${CMAKE_SIZEOF_VOID_P}) for\n" - " CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}\n" - " CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}\n" - " CMAKE_GENERATOR=${CMAKE_GENERATOR}\n") + message( + FATAL_ERROR "--- Unexpected pointer size (${CMAKE_SIZEOF_VOID_P}) for\n" + " CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}\n" + " CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}\n" + " CMAKE_GENERATOR=${CMAKE_GENERATOR}\n") endif() - elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR - "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") + elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" + OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") set(AOM_TARGET_CPU "x86") - elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm" OR - "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^mips") + elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm" + OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^mips") set(AOM_TARGET_CPU "${CMAKE_SYSTEM_PROCESSOR}") elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64") set(AOM_TARGET_CPU "arm64") @@ -69,7 +69,7 @@ if(CMAKE_TOOLCHAIN_FILE) # Add toolchain file to config string. if(IS_ABSOLUTE "${CMAKE_TOOLCHAIN_FILE}") file(RELATIVE_PATH toolchain_path "${AOM_CONFIG_DIR}" - "${CMAKE_TOOLCHAIN_FILE}") + "${CMAKE_TOOLCHAIN_FILE}") else() set(toolchain_path "${CMAKE_TOOLCHAIN_FILE}") endif() @@ -104,8 +104,8 @@ # TODO(tomfinegan): clang needs -pie in CMAKE_EXE_LINKER_FLAGS for this to # work. set(CMAKE_POSITION_INDEPENDENT_CODE ON) - if("${AOM_TARGET_SYSTEM}" STREQUAL "Linux" AND "${AOM_TARGET_CPU}" MATCHES - "^armv[78]") + if("${AOM_TARGET_SYSTEM}" STREQUAL "Linux" + AND "${AOM_TARGET_CPU}" MATCHES "^armv[78]") set(AOM_AS_FLAGS ${AOM_AS_FLAGS} --defsym PIC=1) else() set(AOM_AS_FLAGS ${AOM_AS_FLAGS} -DPIC) @@ -124,10 +124,11 @@ endif() if(NOT AS_EXECUTABLE) - message(FATAL_ERROR - "Unable to find assembler. Install 'yasm' or 'nasm.' " - "To build without optimizations, add -DAOM_TARGET_CPU=generic to " - "your cmake command line.") + message( + FATAL_ERROR + "Unable to find assembler. Install 'yasm' or 'nasm.' " + "To build without optimizations, add -DAOM_TARGET_CPU=generic to " + "your cmake command line.") endif() get_asm_obj_format("objformat") set(AOM_AS_FLAGS -f ${objformat} ${AOM_AS_FLAGS}) @@ -146,8 +147,9 @@ endif() endif() if(NOT AS_EXECUTABLE) - message(FATAL_ERROR - "Unknown assembler for: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}") + message( + FATAL_ERROR + "Unknown assembler for: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}") endif() string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) @@ -199,15 +201,12 @@ if(NOT MSVC) aom_push_var(CMAKE_REQUIRED_LIBRARIES "m") - aom_check_c_compiles( - "fenv_check" - "#define _GNU_SOURCE + aom_check_c_compiles("fenv_check" "#define _GNU_SOURCE #include <fenv.h> void unused(void) { (void)unused; (void)feenableexcept(FE_DIVBYZERO | FE_INVALID); - }" - HAVE_FEXCEPT) + }" HAVE_FEXCEPT) aom_pop_var(CMAKE_REQUIRED_LIBRARIES) endif() @@ -267,8 +266,8 @@ add_compiler_flag_if_supported("-Wunused") add_compiler_flag_if_supported("-Wvla") - if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND "${SANITIZE}" MATCHES - "address|undefined") + if(CMAKE_C_COMPILER_ID MATCHES "GNU" + AND "${SANITIZE}" MATCHES "address|undefined") # This combination has more stack overhead, so we account for it by # providing higher stack limit than usual. @@ -317,10 +316,10 @@ # Generate aom_config templates. set(aom_config_asm_template "${AOM_CONFIG_DIR}/config/aom_config.asm.cmake") set(aom_config_h_template "${AOM_CONFIG_DIR}/config/aom_config.h.cmake") -execute_process(COMMAND - ${CMAKE_COMMAND} -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} - -DAOM_ROOT=${AOM_ROOT} -P - "${AOM_ROOT}/build/cmake/generate_aom_config_templates.cmake") +execute_process( + COMMAND ${CMAKE_COMMAND} + -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} -DAOM_ROOT=${AOM_ROOT} -P + "${AOM_ROOT}/build/cmake/generate_aom_config_templates.cmake") # Generate aom_config.{asm,h}. configure_file("${aom_config_asm_template}" @@ -344,14 +343,14 @@ endif() set(AOM_RTCD_CONFIG_FILE_LIST "${AOM_ROOT}/aom_dsp/aom_dsp_rtcd_defs.pl" - "${AOM_ROOT}/aom_scale/aom_scale_rtcd.pl" - "${AOM_ROOT}/av1/common/av1_rtcd_defs.pl") + "${AOM_ROOT}/aom_scale/aom_scale_rtcd.pl" + "${AOM_ROOT}/av1/common/av1_rtcd_defs.pl") set(AOM_RTCD_HEADER_FILE_LIST "${AOM_CONFIG_DIR}/config/aom_dsp_rtcd.h" - "${AOM_CONFIG_DIR}/config/aom_scale_rtcd.h" - "${AOM_CONFIG_DIR}/config/av1_rtcd.h") + "${AOM_CONFIG_DIR}/config/aom_scale_rtcd.h" + "${AOM_CONFIG_DIR}/config/av1_rtcd.h") set(AOM_RTCD_SOURCE_FILE_LIST "${AOM_ROOT}/aom_dsp/aom_dsp_rtcd.c" - "${AOM_ROOT}/aom_scale/aom_scale_rtcd.c" - "${AOM_ROOT}/av1/common/av1_rtcd.c") + "${AOM_ROOT}/aom_scale/aom_scale_rtcd.c" + "${AOM_ROOT}/av1/common/av1_rtcd.c") set(AOM_RTCD_SYMBOL_LIST aom_dsp_rtcd aom_scale_rtcd av1_rtcd) list(LENGTH AOM_RTCD_SYMBOL_LIST AOM_RTCD_CUSTOM_COMMAND_COUNT) math(EXPR AOM_RTCD_CUSTOM_COMMAND_COUNT "${AOM_RTCD_CUSTOM_COMMAND_COUNT} - 1") @@ -361,16 +360,18 @@ list(GET AOM_RTCD_HEADER_FILE_LIST ${NUM} AOM_RTCD_HEADER_FILE) list(GET AOM_RTCD_SOURCE_FILE_LIST ${NUM} AOM_RTCD_SOURCE_FILE) list(GET AOM_RTCD_SYMBOL_LIST ${NUM} AOM_RTCD_SYMBOL) - execute_process(COMMAND ${PERL_EXECUTABLE} "${AOM_ROOT}/build/cmake/rtcd.pl" - --arch=${AOM_TARGET_CPU} - --sym=${AOM_RTCD_SYMBOL} ${AOM_RTCD_FLAGS} - --config=${AOM_CONFIG_DIR}/config/aom_config.h - ${AOM_RTCD_CONFIG_FILE} - OUTPUT_FILE ${AOM_RTCD_HEADER_FILE}) + execute_process( + COMMAND + ${PERL_EXECUTABLE} "${AOM_ROOT}/build/cmake/rtcd.pl" + --arch=${AOM_TARGET_CPU} + --sym=${AOM_RTCD_SYMBOL} ${AOM_RTCD_FLAGS} + --config=${AOM_CONFIG_DIR}/config/aom_config.h ${AOM_RTCD_CONFIG_FILE} + OUTPUT_FILE ${AOM_RTCD_HEADER_FILE}) endforeach() # Generate aom_version.h. -execute_process(COMMAND ${CMAKE_COMMAND} -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} +execute_process(COMMAND ${CMAKE_COMMAND} + -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} -DAOM_ROOT=${AOM_ROOT} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DPERL_EXECUTABLE=${PERL_EXECUTABLE} -P
diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake index 47206d8..02ee9ee 100644 --- a/build/cmake/aom_install.cmake +++ b/build/cmake/aom_install.cmake
@@ -36,20 +36,20 @@ add_library(aom_pc ${AOM_PKG_CONFIG_SOURCES}) # Setup a rule to generate aom.pc. - add_custom_command(OUTPUT "${AOM_PKG_CONFIG_FILE}" - COMMAND - ${CMAKE_COMMAND} ARGS - -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} - -DAOM_ROOT=${AOM_ROOT} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} - -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME} - -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD} - -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P - "${AOM_ROOT}/build/cmake/pkg_config.cmake" - COMMENT "Writing aom.pc" VERBATIM) + add_custom_command( + OUTPUT "${AOM_PKG_CONFIG_FILE}" + COMMAND ${CMAKE_COMMAND} ARGS + -DAOM_CONFIG_DIR=${AOM_CONFIG_DIR} -DAOM_ROOT=${AOM_ROOT} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} + -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} + -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME} + -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD} + -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P + "${AOM_ROOT}/build/cmake/pkg_config.cmake" + COMMENT "Writing aom.pc" + VERBATIM) # Explicitly add a dependency on the pkg-config file to ensure it's built. get_property(aom_pc_sources TARGET aom_pc PROPERTY SOURCES) @@ -75,10 +75,12 @@ set(AOM_INSTALL_LIBS aom) # Setup the install rules. - install(FILES ${AOM_INSTALL_INCS} DESTINATION - "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom") - install(FILES "${AOM_PKG_CONFIG_FILE}" DESTINATION - "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install( + FILES ${AOM_INSTALL_INCS} + DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom") + install( + FILES "${AOM_PKG_CONFIG_FILE}" + DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig") install(TARGETS ${AOM_INSTALL_LIBS} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake index be32a32..9879ea7 100644 --- a/build/cmake/aom_optimization.cmake +++ b/build/cmake/aom_optimization.cmake
@@ -85,8 +85,8 @@ set(objformat "macho64") elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") set(objformat "elf64") - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}" - STREQUAL "Windows") + elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" + OR "${AOM_TARGET_SYSTEM}" STREQUAL "Windows") set(objformat "win64") else() message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}") @@ -96,15 +96,15 @@ set(objformat "macho32") elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") set(objformat "elf32") - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}" - STREQUAL "Windows") + elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" + OR "${AOM_TARGET_SYSTEM}" STREQUAL "Windows") set(objformat "win32") else() message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}") endif() else() - message(FATAL_ERROR - "Unknown obj format: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}") + message( + FATAL_ERROR "Unknown obj format: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}") endif() set(${out_format} ${objformat} PARENT_SCOPE) @@ -138,7 +138,8 @@ "${asm_object}" "${asm_source}" DEPENDS "${asm_source}" COMMENT "Building ASM object ${asm_object}" - WORKING_DIRECTORY "${AOM_CONFIG_DIR}" VERBATIM) + WORKING_DIRECTORY "${AOM_CONFIG_DIR}" + VERBATIM) target_sources(aom PRIVATE "${asm_object}") endforeach() @@ -161,32 +162,32 @@ execute_process(COMMAND ${AS_EXECUTABLE} -hf OUTPUT_VARIABLE nasm_helptext) if(NOT "${nasm_helptext}" MATCHES "-Ox") - message(FATAL_ERROR - "Unsupported nasm: multipass optimization not supported.") + message( + FATAL_ERROR "Unsupported nasm: multipass optimization not supported.") endif() if("${AOM_TARGET_CPU}" STREQUAL "x86") if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") if(NOT "${nasm_helptext}" MATCHES "macho32") - message(FATAL_ERROR - "Unsupported nasm: macho32 object format not supported.") + message( + FATAL_ERROR "Unsupported nasm: macho32 object format not supported.") endif() elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") if(NOT "${nasm_helptext}" MATCHES "elf32") - message(FATAL_ERROR - "Unsupported nasm: elf32 object format not supported.") + message( + FATAL_ERROR "Unsupported nasm: elf32 object format not supported.") endif() endif() else() if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") if(NOT "${nasm_helptext}" MATCHES "macho64") - message(FATAL_ERROR - "Unsupported nasm: macho64 object format not supported.") + message( + FATAL_ERROR "Unsupported nasm: macho64 object format not supported.") endif() elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") if(NOT "${nasm_helptext}" MATCHES "elf64") - message(FATAL_ERROR - "Unsupported nasm: elf64 object format not supported.") + message( + FATAL_ERROR "Unsupported nasm: elf64 object format not supported.") endif() endif() endif() @@ -197,16 +198,16 @@ # include file, $source is the C source file, and $symbol is used for the symbol # argument passed to rtcd.pl. function(add_rtcd_build_step config output source symbol) - add_custom_command(OUTPUT ${output} - COMMAND ${PERL_EXECUTABLE} ARGS - "${AOM_ROOT}/build/cmake/rtcd.pl" - --arch=${AOM_TARGET_CPU} - --sym=${symbol} ${AOM_RTCD_FLAGS} - --config=${AOM_CONFIG_DIR}/config/aom_config.h - ${config} > ${output} - DEPENDS ${config} - COMMENT "Generating ${output}" - WORKING_DIRECTORY ${AOM_CONFIG_DIR} VERBATIM) + add_custom_command( + OUTPUT ${output} + COMMAND ${PERL_EXECUTABLE} ARGS "${AOM_ROOT}/build/cmake/rtcd.pl" + --arch=${AOM_TARGET_CPU} + --sym=${symbol} ${AOM_RTCD_FLAGS} + --config=${AOM_CONFIG_DIR}/config/aom_config.h ${config} > ${output} + DEPENDS ${config} + COMMENT "Generating ${output}" + WORKING_DIRECTORY ${AOM_CONFIG_DIR} + VERBATIM) set_property(SOURCE ${source} PROPERTY OBJECT_DEPENDS ${output}) set_property(SOURCE ${output} PROPERTY GENERATED) endfunction()
diff --git a/build/cmake/compiler_flags.cmake b/build/cmake/compiler_flags.cmake index 79192c1..24484bc 100644 --- a/build/cmake/compiler_flags.cmake +++ b/build/cmake/compiler_flags.cmake
@@ -131,8 +131,8 @@ message("Checking C compiler flag support for: " ${c_flag}) check_c_compiler_flag("${c_flag}" HAVE_C_FLAG) if(NOT HAVE_C_FLAG) - message(FATAL_ERROR - "${PROJECT_NAME} requires support for C flag: ${c_flag}.") + message( + FATAL_ERROR "${PROJECT_NAME} requires support for C flag: ${c_flag}.") endif() if(NOT "${AOM_EXE_LINKER_FLAGS}" STREQUAL "") @@ -167,8 +167,8 @@ message("Checking C compiler flag support for: " ${cxx_flag}) check_cxx_compiler_flag("${cxx_flag}" HAVE_CXX_FLAG) if(NOT HAVE_CXX_FLAG) - message(FATAL_ERROR - "${PROJECT_NAME} requires support for C flag: ${cxx_flag}.") + message( + FATAL_ERROR "${PROJECT_NAME} requires support for C flag: ${cxx_flag}.") endif() if(NOT "${AOM_EXE_LINKER_FLAGS}" STREQUAL "")
diff --git a/build/cmake/compiler_tests.cmake b/build/cmake/compiler_tests.cmake index f115610..0402832 100644 --- a/build/cmake/compiler_tests.cmake +++ b/build/cmake/compiler_tests.cmake
@@ -87,10 +87,12 @@ set(${result_var} ${C_TEST_COMPILED} PARENT_SCOPE) if(C_TEST_COMPILED) - set(AOM_C_PASSED_TESTS "${AOM_C_PASSED_TESTS} ${test_name}" + set(AOM_C_PASSED_TESTS + "${AOM_C_PASSED_TESTS} ${test_name}" CACHE STRING "" FORCE) else() - set(AOM_C_FAILED_TESTS "${AOM_C_FAILED_TESTS} ${test_name}" + set(AOM_C_FAILED_TESTS + "${AOM_C_FAILED_TESTS} ${test_name}" CACHE STRING "" FORCE) message("C Compiler test ${test_name} failed.") endif() @@ -123,10 +125,12 @@ set(${result_var} ${CXX_TEST_COMPILED} PARENT_SCOPE) if(CXX_TEST_COMPILED) - set(AOM_CXX_PASSED_TESTS "${AOM_CXX_PASSED_TESTS} ${test_name}" + set(AOM_CXX_PASSED_TESTS + "${AOM_CXX_PASSED_TESTS} ${test_name}" CACHE STRING "" FORCE) else() - set(AOM_CXX_FAILED_TESTS "${AOM_CXX_FAILED_TESTS} ${test_name}" + set(AOM_CXX_FAILED_TESTS + "${AOM_CXX_FAILED_TESTS} ${test_name}" CACHE STRING "" FORCE) message("CXX Compiler test ${test_name} failed.") endif()
diff --git a/build/cmake/dist.cmake b/build/cmake/dist.cmake index 6f81736..5b9fc95 100644 --- a/build/cmake/dist.cmake +++ b/build/cmake/dist.cmake
@@ -17,8 +17,8 @@ set(${out_string} "${${out_string}}" PARENT_SCOPE) endfunction() -set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "AOM_DIST_DIR" - "AOM_DIST_INCLUDES" "AOM_DIST_LIBS" "ENABLE_DOCS") +set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "AOM_DIST_DIR" "AOM_DIST_INCLUDES" + "AOM_DIST_LIBS" "ENABLE_DOCS") foreach(arg ${REQUIRED_ARGS}) if("${${arg}}" STREQUAL "")
diff --git a/build/cmake/exports.cmake b/build/cmake/exports.cmake index b6e14d9..fa7842c 100644 --- a/build/cmake/exports.cmake +++ b/build/cmake/exports.cmake
@@ -28,15 +28,19 @@ set(aom_sym_file "${AOM_CONFIG_DIR}/libaom.${symbol_file_ext}") add_custom_target(generate_exports - COMMAND ${CMAKE_COMMAND} -DAOM_ROOT="${AOM_ROOT}" + COMMAND ${CMAKE_COMMAND} + -DAOM_ROOT="${AOM_ROOT}" -DAOM_CONFIG_DIR="${AOM_CONFIG_DIR}" -DAOM_TARGET_SYSTEM=${AOM_TARGET_SYSTEM} - -DAOM_SYM_FILE="${aom_sym_file}" -DAOM_MSVC=${MSVC} - -DAOM_XCODE=${XCODE} -DCONFIG_NAME=$<CONFIG> + -DAOM_SYM_FILE="${aom_sym_file}" + -DAOM_MSVC=${MSVC} + -DAOM_XCODE=${XCODE} + -DCONFIG_NAME=$<CONFIG> -DCONFIG_AV1_DECODER=${CONFIG_AV1_DECODER} -DCONFIG_AV1_ENCODER=${CONFIG_AV1_ENCODER} -DCONFIG_INSPECTION=${CONFIG_INSPECTION} - -DENABLE_TESTS=${ENABLE_TESTS} -P + -DENABLE_TESTS=${ENABLE_TESTS} + -P "${AOM_ROOT}/build/cmake/generate_exports.cmake" SOURCES ${AOM_EXPORTS_SOURCES} DEPENDS ${AOM_EXPORTS_SOURCES}) @@ -46,21 +50,25 @@ add_dependencies(aom generate_exports) if(APPLE) - set_property(TARGET aom APPEND_STRING + set_property(TARGET aom + APPEND_STRING PROPERTY LINK_FLAGS "-exported_symbols_list ${aom_sym_file}") elseif(WIN32) if(NOT MSVC) - set_property(TARGET aom APPEND_STRING + set_property(TARGET aom + APPEND_STRING PROPERTY LINK_FLAGS "-Wl,--version-script ${aom_sym_file}") else() - set_property(TARGET aom APPEND_STRING + set_property(TARGET aom + APPEND_STRING PROPERTY LINK_FLAGS "/DEF:${aom_sym_file}") endif() # TODO(tomfinegan): Sort out the import lib situation and flags for MSVC. else() - set_property(TARGET aom APPEND_STRING + set_property(TARGET aom + APPEND_STRING PROPERTY LINK_FLAGS "-Wl,--version-script,${aom_sym_file}") endif() endfunction()
diff --git a/build/cmake/generate_exports.cmake b/build/cmake/generate_exports.cmake index 7ab5aae..f1d15a0 100644 --- a/build/cmake/generate_exports.cmake +++ b/build/cmake/generate_exports.cmake
@@ -10,8 +10,8 @@ # cmake_minimum_required(VERSION 3.5) -set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "AOM_TARGET_SYSTEM" - "AOM_SYM_FILE" "CONFIG_AV1_DECODER" "CONFIG_AV1_ENCODER") +set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "AOM_TARGET_SYSTEM" "AOM_SYM_FILE" + "CONFIG_AV1_DECODER" "CONFIG_AV1_ENCODER") foreach(arg ${REQUIRED_ARGS}) if("${${arg}}" STREQUAL "")
diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake index 358c1a2..c3914d7 100644 --- a/build/cmake/pkg_config.cmake +++ b/build/cmake/pkg_config.cmake
@@ -11,8 +11,9 @@ cmake_minimum_required(VERSION 3.5) set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "CMAKE_INSTALL_PREFIX" - "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR" "CMAKE_INSTALL_LIBDIR" - "CMAKE_PROJECT_NAME" "CONFIG_MULTITHREAD" "HAVE_PTHREAD_H") + "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR" + "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME" + "CONFIG_MULTITHREAD" "HAVE_PTHREAD_H") foreach(arg ${REQUIRED_ARGS}) if("${${arg}}" STREQUAL "") @@ -47,9 +48,8 @@ file(APPEND "${pkgconfig_file}" "libdir=\${exec_prefix}/${libdir}\n\n") file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n") file( - APPEND - "${pkgconfig_file}" - "Description: Alliance for Open Media AV1 codec library v${aom_version}.\n") + APPEND "${pkgconfig_file}" + "Description: Alliance for Open Media AV1 codec library v${aom_version}.\n") file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n") file(APPEND "${pkgconfig_file}" "Requires:\n") file(APPEND "${pkgconfig_file}" "Conflicts:\n")
diff --git a/build/cmake/sanitizers.cmake b/build/cmake/sanitizers.cmake index a8bd93c..5d7542d 100644 --- a/build/cmake/sanitizers.cmake +++ b/build/cmake/sanitizers.cmake
@@ -24,14 +24,10 @@ # Require the sanitizer requested. cfi sanitizer requires all the flags in order # for the compiler to accept it. if("${SANITIZE}" MATCHES "cfi" AND CMAKE_C_COMPILER_ID MATCHES "Clang") - require_linker_flag( - "-fsanitize=${SANITIZE} -flto -fno-sanitize-trap=cfi \ - -fuse-ld=gold" - YES) - require_compiler_flag( - "-fsanitize=${SANITIZE} -flto -fvisibility=hidden \ - -fno-sanitize-trap=cfi" - YES) + require_linker_flag("-fsanitize=${SANITIZE} -flto -fno-sanitize-trap=cfi \ + -fuse-ld=gold" YES) + require_compiler_flag("-fsanitize=${SANITIZE} -flto -fvisibility=hidden \ + -fno-sanitize-trap=cfi" YES) else() require_linker_flag("-fsanitize=${SANITIZE}") require_compiler_flag("-fsanitize=${SANITIZE}" YES) @@ -52,8 +48,8 @@ # Fix link errors due to missing rt compiler lib in 32-bit builds. # http://llvm.org/bugs/show_bug.cgi?id=17693 if(CMAKE_C_COMPILER_ID MATCHES "Clang") - if(${CMAKE_SIZEOF_VOID_P} EQUAL 4 AND "${SANITIZE}" MATCHES - "integer|undefined") + if(${CMAKE_SIZEOF_VOID_P} EQUAL 4 + AND "${SANITIZE}" MATCHES "integer|undefined") require_linker_flag("--rtlib=compiler-rt -lgcc_s") endif() endif()
diff --git a/build/cmake/toolchains/armv7-linux-gcc.cmake b/build/cmake/toolchains/armv7-linux-gcc.cmake index 6cbc2a8..e3588e8 100644 --- a/build/cmake/toolchains/armv7-linux-gcc.cmake +++ b/build/cmake/toolchains/armv7-linux-gcc.cmake
@@ -31,7 +31,7 @@ set(CMAKE_C_COMPILER_ARG1 "-march=armv7-a ${AOM_EXTRA_TOOLCHAIN_FLAGS}") set(CMAKE_CXX_COMPILER_ARG1 "-march=armv7-a ${AOM_EXTRA_TOOLCHAIN_FLAGS}") set(AOM_AS_FLAGS --defsym ARCHITECTURE=7 -march=armv7-a -mfpu=neon - ${AOM_EXTRA_TOOLCHAIN_FLAGS}) + ${AOM_EXTRA_TOOLCHAIN_FLAGS}) set(CMAKE_SYSTEM_PROCESSOR "armv7") set(AOM_NEON_INTRIN_FLAG "-mfpu=neon")
diff --git a/build/cmake/util.cmake b/build/cmake/util.cmake index 9ef3a64..76c9cf8 100644 --- a/build/cmake/util.cmake +++ b/build/cmake/util.cmake
@@ -21,12 +21,11 @@ # variable referred to by $out_file_list_var parameter. macro(create_dummy_source_file basename extension out_file_list_var) set(dummy_source_file "${AOM_GEN_SRC_DIR}/${basename}_dummy.${extension}") - file( - WRITE - "${dummy_source_file}" "// Generated file. DO NOT EDIT!\n" - "// ${target_name} needs a ${extension} file to force link language, \n" - "// or to silence a harmless CMake warning: Ignore me.\n" - "void aom_${target_name}_dummy_function(void) {}\n") + file(WRITE "${dummy_source_file}" + "// Generated file. DO NOT EDIT!\n" + "// ${target_name} needs a ${extension} file to force link language, \n" + "// or to silence a harmless CMake warning: Ignore me.\n" + "void aom_${target_name}_dummy_function(void) {}\n") list(APPEND "${out_file_list_var}" "${dummy_source_file}") endmacro() @@ -85,8 +84,8 @@ set(CMAKE_CXX_COMPILER_LAUNCHER "${launcher_path}" PARENT_SCOPE) message("--- Using ${launcher_name} as compiler launcher.") else() - message(WARNING - "--- Cannot find ${launcher_name}, ${launcher_flag} ignored.") + message( + WARNING "--- Cannot find ${launcher_name}, ${launcher_flag} ignored.") endif() endfunction()
diff --git a/build/cmake/version.cmake b/build/cmake/version.cmake index d169b12..ab7f215 100644 --- a/build/cmake/version.cmake +++ b/build/cmake/version.cmake
@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.5) set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "GIT_EXECUTABLE" - "PERL_EXECUTABLE") + "PERL_EXECUTABLE") foreach(arg ${REQUIRED_ARGS}) if("${${arg}}" STREQUAL "") @@ -25,7 +25,8 @@ unset(aom_version) if(EXISTS "${GIT_EXECUTABLE}") execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${AOM_ROOT}/.git describe - OUTPUT_VARIABLE aom_version ERROR_QUIET) + OUTPUT_VARIABLE aom_version + ERROR_QUIET) string(STRIP "${aom_version}" aom_version) # Remove the leading 'v' from the version string. @@ -49,9 +50,8 @@ # TODO(tomfinegan): Perl dependency is unnecessary. CMake can do everything # that is done by version.pl on its own (if a bit more verbose...). - execute_process(COMMAND - ${PERL_EXECUTABLE} "${AOM_ROOT}/build/cmake/version.pl" - --version_data=${aom_version} - --version_filename=${AOM_CONFIG_DIR}/config/aom_version.h - VERBATIM) + execute_process( + COMMAND ${PERL_EXECUTABLE} "${AOM_ROOT}/build/cmake/version.pl" + --version_data=${aom_version} + --version_filename=${AOM_CONFIG_DIR}/config/aom_version.h VERBATIM) endif()
diff --git a/docs.cmake b/docs.cmake index b5bfa9b..6b5d47a 100644 --- a/docs.cmake +++ b/docs.cmake
@@ -20,111 +20,117 @@ set(AOM_DOXYGEN_OUTPUT_DIR "${AOM_CONFIG_DIR}/dox") set(AOM_DOXYGEN_SECTIONS "av1") -set(AOM_DOXYGEN_SOURCES - "${AOM_ROOT}/aom/aom.h" - "${AOM_ROOT}/aom/aom_codec.h" - "${AOM_ROOT}/aom/aom_decoder.h" - "${AOM_ROOT}/aom/aom_encoder.h" - "${AOM_ROOT}/aom/aom_frame_buffer.h" - "${AOM_ROOT}/aom/aom_image.h" - "${AOM_ROOT}/aom/aom_integer.h" - "${AOM_ROOT}/keywords.dox" - "${AOM_ROOT}/mainpage.dox" - "${AOM_ROOT}/usage.dox") +set(AOM_DOXYGEN_SOURCES "${AOM_ROOT}/aom/aom.h" "${AOM_ROOT}/aom/aom_codec.h" + "${AOM_ROOT}/aom/aom_decoder.h" + "${AOM_ROOT}/aom/aom_encoder.h" + "${AOM_ROOT}/aom/aom_frame_buffer.h" + "${AOM_ROOT}/aom/aom_image.h" + "${AOM_ROOT}/aom/aom_integer.h" + "${AOM_ROOT}/keywords.dox" "${AOM_ROOT}/mainpage.dox" + "${AOM_ROOT}/usage.dox") if(CONFIG_AV1_DECODER) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/apps/aomdec.c" "${AOM_ROOT}/examples/decode_to_md5.c" - "${AOM_ROOT}/examples/decode_with_drops.c" - "${AOM_ROOT}/examples/simple_decoder.c") + "${AOM_ROOT}/apps/aomdec.c" + "${AOM_ROOT}/examples/decode_to_md5.c" + "${AOM_ROOT}/examples/decode_with_drops.c" + "${AOM_ROOT}/examples/simple_decoder.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Full featured decoder." "Frame by frame MD5 checksum." - "Drops frames while decoding." "Simplified decoder loop.") + "Full featured decoder." + "Frame by frame MD5 checksum." + "Drops frames while decoding." + "Simplified decoder loop.") set(AOM_DOXYGEN_SECTIONS ${AOM_DOXYGEN_SECTIONS} "av1_decoder decoder") set(AOM_DOXYGEN_SOURCES ${AOM_DOXYGEN_SOURCES} "${AOM_ROOT}/aom/aomdx.h" - "${AOM_ROOT}/usage_dx.dox") + "${AOM_ROOT}/usage_dx.dox") if(CONFIG_ANALYZER) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/examples/analyzer.cc") + "${AOM_ROOT}/examples/analyzer.cc") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Bitstream analyzer.") + "Bitstream analyzer.") endif() if(CONFIG_INSPECTION) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/examples/inspect.c") + "${AOM_ROOT}/examples/inspect.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Bitstream inspector.") + "Bitstream inspector.") endif() endif() if(CONFIG_AV1_ENCODER) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/apps/aomenc.c" "${AOM_ROOT}/examples/lossless_encoder.c" - "${AOM_ROOT}/examples/set_maps.c" "${AOM_ROOT}/examples/simple_encoder.c" - "${AOM_ROOT}/examples/twopass_encoder.c") + "${AOM_ROOT}/apps/aomenc.c" + "${AOM_ROOT}/examples/lossless_encoder.c" + "${AOM_ROOT}/examples/set_maps.c" + "${AOM_ROOT}/examples/simple_encoder.c" + "${AOM_ROOT}/examples/twopass_encoder.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Full featured encoder." "Simplified lossless encoder." - "Set active and ROI maps." "Simplified encoder loop." - "Two-pass encoder loop.") + "Full featured encoder." + "Simplified lossless encoder." + "Set active and ROI maps." + "Simplified encoder loop." + "Two-pass encoder loop.") set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/examples/scalable_encoder.c") + "${AOM_ROOT}/examples/scalable_encoder.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Scalable encoder loop.") + "Scalable encoder loop.") set(AOM_DOXYGEN_SECTIONS ${AOM_DOXYGEN_SECTIONS} "av1_encoder encoder") set(AOM_DOXYGEN_SOURCES ${AOM_DOXYGEN_SOURCES} "${AOM_ROOT}/aom/aomcx.h" - "${AOM_ROOT}/usage_cx.dox") + "${AOM_ROOT}/usage_cx.dox") endif() if(CONFIG_AV1_DECODER AND CONFIG_AV1_ENCODER) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/examples/aom_cx_set_ref.c") + "${AOM_ROOT}/examples/aom_cx_set_ref.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Set encoder reference frame.") + "Set encoder reference frame.") endif() if(CONFIG_AV1_ENCODER) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/examples/lightfield_encoder.c") + "${AOM_ROOT}/examples/lightfield_encoder.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Lightfield encoder example.") + "Lightfield encoder example.") endif() if(CONFIG_AV1_DECODER) - set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} + set(AOM_DOXYGEN_EXAMPLE_SOURCES + ${AOM_DOXYGEN_EXAMPLE_SOURCES} "${AOM_ROOT}/examples/lightfield_tile_list_decoder.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Lightfield tile list decoder example.") + "Lightfield tile list decoder example.") endif() if(CONFIG_AV1_DECODER) set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} - "${AOM_ROOT}/examples/lightfield_decoder.c") + "${AOM_ROOT}/examples/lightfield_decoder.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Lightfield decoder example.") + "Lightfield decoder example.") endif() if(CONFIG_AV1_DECODER AND CONFIG_AV1_ENCODER) - set(AOM_DOXYGEN_EXAMPLE_SOURCES ${AOM_DOXYGEN_EXAMPLE_SOURCES} + set(AOM_DOXYGEN_EXAMPLE_SOURCES + ${AOM_DOXYGEN_EXAMPLE_SOURCES} "${AOM_ROOT}/examples/lightfield_bitstream_parsing.c") set(AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS ${AOM_DOXYGEN_EXAMPLE_DESCRIPTIONS} - "Lightfield bitstream parsing example.") + "Lightfield bitstream parsing example.") endif() # Iterates over list named by $list_name and appends each item to $AOM_DOXYFILE @@ -169,25 +175,19 @@ # Generate samples.dox, an index page that refers to the example_basename.dox # files that were just created. - set( - samples_header - " + set(samples_header " /*!\\page samples Sample Code This SDK includes a number of sample applications. Each sample documents a feature of the SDK in both prose and the associated C code. The following samples are included: -" - ) +") - set( - utils_desc - " + set(utils_desc " In addition, the SDK contains a number of utilities. Since these utilities are built upon the concepts described in the sample code listed above, they are not documented in pieces like the samples are. Their source is included here for reference. The following utilities are included: -" - ) +") # Write the description for the samples section. set(samples_dox "${AOM_CONFIG_DIR}/samples.dox") @@ -230,11 +230,11 @@ file(READ "${AOM_ROOT}/${AOM_DOXYGEN_CONFIG_TEMPLATE}" doxygen_template_data) file(APPEND "${AOM_DOXYFILE}" ${doxygen_template_data}) file(APPEND "${AOM_DOXYFILE}" - "EXAMPLE_PATH += ${AOM_ROOT} ${AOM_ROOT}/examples\n") + "EXAMPLE_PATH += ${AOM_ROOT} ${AOM_ROOT}/examples\n") file(APPEND "${AOM_DOXYFILE}" - "INCLUDE_PATH += ${AOM_CONFIG_DIR} ${AOM_ROOT}\n") + "INCLUDE_PATH += ${AOM_CONFIG_DIR} ${AOM_ROOT}\n") file(APPEND "${AOM_DOXYFILE}" - "STRIP_FROM_PATH += ${AOM_ROOT} ${AOM_CONFIG_DIR}\n") + "STRIP_FROM_PATH += ${AOM_ROOT} ${AOM_CONFIG_DIR}\n") write_cmake_list_to_doxygen_config_var("INPUT" "AOM_DOXYGEN_SOURCES") write_cmake_list_to_doxygen_config_var("ENABLED_SECTIONS" "AOM_DOXYGEN_SECTIONS")
diff --git a/test/test.cmake b/test/test.cmake index c5c10e2..681349a 100644 --- a/test/test.cmake +++ b/test/test.cmake
@@ -234,10 +234,10 @@ if(ENABLE_TESTS) find_package(PythonInterp) if(NOT PYTHONINTERP_FOUND) - message(FATAL_ERROR - "--- Unit tests require Python, rerun cmake with " - "-DENABLE_TESTS=0 to avoid this error, or install Python and " - "make sure it's in your PATH.") + message( + FATAL_ERROR "--- Unit tests require Python, rerun cmake with " + "-DENABLE_TESTS=0 to avoid this error, or install Python and " + "make sure it's in your PATH.") endif() if(BUILD_SHARED_LIBS AND APPLE) # Silence an RPATH warning. @@ -249,8 +249,8 @@ include_directories("${AOM_ROOT}/third_party/googletest/src/googletest") add_library( - aom_gtest - STATIC "${AOM_ROOT}/third_party/googletest/src/googletest/src/gtest-all.cc") + aom_gtest STATIC + "${AOM_ROOT}/third_party/googletest/src/googletest/src/gtest-all.cc") if(MSVC OR WIN32) target_compile_definitions(aom_gtest PRIVATE GTEST_OS_WINDOWS=1) elseif(CONFIG_MULTITHREAD AND CMAKE_USE_PTHREADS_INIT) @@ -283,8 +283,8 @@ endif() add_executable(test_libaom ${AOM_UNIT_TEST_WRAPPER_SOURCES} - $<TARGET_OBJECTS:aom_common_app_util> - $<TARGET_OBJECTS:test_aom_common>) + $<TARGET_OBJECTS:aom_common_app_util> + $<TARGET_OBJECTS:test_aom_common>) list(APPEND AOM_APP_TARGETS test_libaom) if(CONFIG_AV1_DECODER) @@ -305,7 +305,8 @@ endif() if(NOT BUILD_SHARED_LIBS) - add_executable(test_intra_pred_speed ${AOM_TEST_INTRA_PRED_SPEED_SOURCES} + add_executable(test_intra_pred_speed + ${AOM_TEST_INTRA_PRED_SPEED_SOURCES} $<TARGET_OBJECTS:aom_common_app_util>) target_link_libraries(test_intra_pred_speed ${AOM_LIB_LINK_TYPE} aom aom_gtest) @@ -358,13 +359,13 @@ foreach(test_index RANGE ${max_file_index}) list(GET test_files ${test_index} test_file) list(GET test_file_checksums ${test_index} test_file_checksum) - add_custom_target(testdata_${test_index} - COMMAND - ${CMAKE_COMMAND} -DAOM_CONFIG_DIR="${AOM_CONFIG_DIR}" - -DAOM_ROOT="${AOM_ROOT}" - -DAOM_TEST_FILE="${test_file}" - -DAOM_TEST_CHECKSUM=${test_file_checksum} -P - "${AOM_ROOT}/test/test_data_download_worker.cmake") + add_custom_target( + testdata_${test_index} + COMMAND ${CMAKE_COMMAND} + -DAOM_CONFIG_DIR="${AOM_CONFIG_DIR}" -DAOM_ROOT="${AOM_ROOT}" + -DAOM_TEST_FILE="${test_file}" + -DAOM_TEST_CHECKSUM=${test_file_checksum} -P + "${AOM_ROOT}/test/test_data_download_worker.cmake") list(APPEND testdata_targets testdata_${test_index}) endforeach() @@ -408,7 +409,7 @@ foreach(var ${all_cmake_vars}) # https://github.com/cheshirekow/cmake_format/issues/34 -# cmake-format: off + # cmake-format: off if (("${var}" MATCHES "_TEST_" AND NOT "${var}" MATCHES "_DATA_\|_CMAKE_\|INTRA_PRED\|_COMPILED\|_HOSTING\|_PERF_\|CODER_") @@ -426,7 +427,7 @@ # Libaom_test_srcs.txt generation. set(libaom_test_srcs_txt_file "${AOM_CONFIG_DIR}/libaom_test_srcs.txt") file(WRITE "${libaom_test_srcs_txt_file}" - "# This file is generated. DO NOT EDIT.\n") + "# This file is generated. DO NOT EDIT.\n") # Static source file list first. foreach(aom_test_source_var ${aom_test_source_vars})
diff --git a/test/test_data_download_worker.cmake b/test/test_data_download_worker.cmake index dc80349..9863171 100644 --- a/test/test_data_download_worker.cmake +++ b/test/test_data_download_worker.cmake
@@ -27,8 +27,8 @@ endif() if("${AOM_TEST_DATA_PATH}" STREQUAL "") - message(WARNING - "Writing test data to ${AOM_CONFIG_DIR}, set " + message( + WARNING "Writing test data to ${AOM_CONFIG_DIR}, set " "$LIBAOM_TEST_DATA_PATH in your environment to avoid this warning.") set(AOM_TEST_DATA_PATH "${AOM_CONFIG_DIR}") endif()
diff --git a/test/test_data_util.cmake b/test/test_data_util.cmake index 630c161..fab3314 100644 --- a/test/test_data_util.cmake +++ b/test/test_data_util.cmake
@@ -628,7 +628,7 @@ # writes it to $local_path. function(download_test_file file_url file_checksum local_path) message("Downloading ${file_url} ...") - file(DOWNLOAD "${file_url}" "${local_path}" SHOW_PROGRESS - EXPECTED_HASH SHA1=${file_checksum}) + file(DOWNLOAD "${file_url}" "${local_path}" SHOW_PROGRESS EXPECTED_HASH + SHA1=${file_checksum}) message("Download of ${file_url} complete.") endfunction()
diff --git a/test/test_runner.cmake b/test/test_runner.cmake index d3747b1..f0648d1 100644 --- a/test/test_runner.cmake +++ b/test/test_runner.cmake
@@ -8,13 +8,13 @@ # License 1.0 was not distributed with this source code in the PATENTS file, you # can obtain it at www.aomedia.org/license/patent. # -if(NOT GTEST_TOTAL_SHARDS OR "${GTEST_SHARD_INDEX}" STREQUAL "" OR NOT - TEST_LIBAOM) +if(NOT GTEST_TOTAL_SHARDS + OR "${GTEST_SHARD_INDEX}" STREQUAL "" + OR NOT TEST_LIBAOM) message( FATAL_ERROR "The variables GTEST_SHARD_INDEX, GTEST_TOTAL_SHARDS and TEST_LIBAOM - must be defined." - ) + must be defined.") endif() set($ENV{GTEST_SHARD_INDEX} ${GTEST_SHARD_INDEX})