cmake: Move defaults for configure output.
Move them to their own file to reduce noise in aom_configure.cmake.
BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76
Change-Id: I8cc605653d7e71d332752b24f07cf81eb538cc56
diff --git a/build/cmake/aom_config.h.cmake b/build/cmake/aom_config.h.cmake
index f5f2583..f3f7dc7 100644
--- a/build/cmake/aom_config.h.cmake
+++ b/build/cmake/aom_config.h.cmake
@@ -44,7 +44,6 @@
#define CONFIG_INSTALL_BINS ${CONFIG_INSTALL_BINS}
#define CONFIG_INSTALL_LIBS ${CONFIG_INSTALL_LIBS}
#define CONFIG_INSTALL_SRCS ${CONFIG_INSTALL_SRCS}
-#define CONFIG_USE_X86INC ${CONFIG_USE_X86INC}
#define CONFIG_DEBUG ${CONFIG_DEBUG}
#define CONFIG_GPROF ${CONFIG_GPROF}
#define CONFIG_GCOV ${CONFIG_GCOV}
@@ -58,6 +57,8 @@
#define CONFIG_DEQUANT_TOKENS ${CONFIG_DEQUANT_TOKENS}
#define CONFIG_DC_RECON ${CONFIG_DC_RECON}
#define CONFIG_RUNTIME_CPU_DETECT ${CONFIG_RUNTIME_CPU_DETECT}
+#define CONFIG_POSTPROC ${CONFIG_POSTPROC}
+#define CONFIG_AV1_POSTPROC ${CONFIG_AV1_POSTPROC}
#define CONFIG_MULTITHREAD ${CONFIG_MULTITHREAD}
#define CONFIG_INTERNAL_STATS ${CONFIG_INTERNAL_STATS}
#define CONFIG_AV1_ENCODER ${CONFIG_AV1_ENCODER}
@@ -73,6 +74,7 @@
#define CONFIG_SHARED ${CONFIG_SHARED}
#define CONFIG_STATIC ${CONFIG_STATIC}
#define CONFIG_SMALL ${CONFIG_SMALL}
+#define CONFIG_POSTPROC_VISUALIZER ${CONFIG_POSTPROC_VISUALIZER}
#define CONFIG_OS_SUPPORT ${CONFIG_OS_SUPPORT}
#define CONFIG_UNIT_TESTS ${CONFIG_UNIT_TESTS}
#define CONFIG_WEBM_IO ${CONFIG_WEBM_IO}
@@ -82,36 +84,56 @@
#define CONFIG_ENCODE_PERF_TESTS ${CONFIG_ENCODE_PERF_TESTS}
#define CONFIG_MULTI_RES_ENCODING ${CONFIG_MULTI_RES_ENCODING}
#define CONFIG_TEMPORAL_DENOISING ${CONFIG_TEMPORAL_DENOISING}
+#define CONFIG_AV1_TEMPORAL_DENOISING ${CONFIG_AV1_TEMPORAL_DENOISING}
#define CONFIG_COEFFICIENT_RANGE_CHECKING ${CONFIG_COEFFICIENT_RANGE_CHECKING}
#define CONFIG_AOM_HIGHBITDEPTH ${CONFIG_AOM_HIGHBITDEPTH}
+#define CONFIG_BETTER_HW_COMPATIBILITY ${CONFIG_BETTER_HW_COMPATIBILITY}
#define CONFIG_EXPERIMENTAL ${CONFIG_EXPERIMENTAL}
#define CONFIG_SIZE_LIMIT ${CONFIG_SIZE_LIMIT}
#define CONFIG_AOM_QM ${CONFIG_AOM_QM}
-#define CONFIG_SPATIAL_SVC ${CONFIG_SPATIAL_SVC}
#define CONFIG_FP_MB_STATS ${CONFIG_FP_MB_STATS}
#define CONFIG_EMULATE_HARDWARE ${CONFIG_EMULATE_HARDWARE}
#define CONFIG_CLPF ${CONFIG_CLPF}
#define CONFIG_DERING ${CONFIG_DERING}
+#define CONFIG_VAR_TX ${CONFIG_VAR_TX}
+#define CONFIG_RECT_TX ${CONFIG_RECT_TX}
#define CONFIG_REF_MV ${CONFIG_REF_MV}
+#define CONFIG_DUAL_FILTER ${CONFIG_DUAL_FILTER}
+#define CONFIG_EXT_TX ${CONFIG_EXT_TX}
+#define CONFIG_TX64X64 ${CONFIG_TX64X64}
#define CONFIG_SUB8X8_MC ${CONFIG_SUB8X8_MC}
#define CONFIG_EXT_INTRA ${CONFIG_EXT_INTRA}
+#define CONFIG_FILTER_INTRA ${CONFIG_FILTER_INTRA}
+#define CONFIG_EXT_INTER ${CONFIG_EXT_INTER}
#define CONFIG_EXT_INTERP ${CONFIG_EXT_INTERP}
-#define CONFIG_EXT_TX ${CONFIG_EXT_TX}
-#define CONFIG_MOTION_VAR ${CONFIG_MOTION_VAR}
#define CONFIG_EXT_REFS ${CONFIG_EXT_REFS}
-#define CONFIG_EXT_COMPOUND ${CONFIG_EXT_COMPOUND}
+#define CONFIG_GLOBAL_MOTION ${CONFIG_GLOBAL_MOTION}
+#define CONFIG_NEW_QUANT ${CONFIG_NEW_QUANT}
#define CONFIG_SUPERTX ${CONFIG_SUPERTX}
#define CONFIG_ANS ${CONFIG_ANS}
#define CONFIG_EC_MULTISYMBOL ${CONFIG_EC_MULTISYMBOL}
-#define CONFIG_DAALA_EC ${CONFIG_DAALA_EC}
-#define CONFIG_PARALLEL_DEBLOCKING ${CONFIG_PARALLEL_DEBLOCKING}
-#define CONFIG_CB4X4 ${CONFIG_CB4X4}
+#define CONFIG_LOOP_RESTORATION ${CONFIG_LOOP_RESTORATION}
+#define CONFIG_EXT_PARTITION ${CONFIG_EXT_PARTITION}
+#define CONFIG_EXT_PARTITION_TYPES ${CONFIG_EXT_PARTITION_TYPES}
+#define CONFIG_EXT_TILE ${CONFIG_EXT_TILE}
+#define CONFIG_MOTION_VAR ${CONFIG_MOTION_VAR}
+#define CONFIG_WARPED_MOTION ${CONFIG_WARPED_MOTION}
+#define CONFIG_ENTROPY ${CONFIG_ENTROPY}
+#define CONFIG_BIDIR_PRED ${CONFIG_BIDIR_PRED}
+#define CONFIG_BITSTREAM_DEBUG ${CONFIG_BITSTREAM_DEBUG}
+#define CONFIG_ALT_INTRA ${CONFIG_ALT_INTRA}
#define CONFIG_PALETTE ${CONFIG_PALETTE}
+#define CONFIG_DAALA_EC ${CONFIG_DAALA_EC}
+#define CONFIG_PVQ ${CONFIG_PVQ}
+#define CONFIG_CB4X4 ${CONFIG_CB4X4}
#define CONFIG_FRAME_SIZE ${CONFIG_FRAME_SIZE}
-#define CONFIG_FILTER_7BIT ${CONFIG_FILTER_7BIT}
#define CONFIG_DELTA_Q ${CONFIG_DELTA_Q}
#define CONFIG_ADAPT_SCAN ${CONFIG_ADAPT_SCAN}
-#define CONFIG_BITSTREAM_DEBUG ${CONFIG_BITSTREAM_DEBUG}
+#define CONFIG_FILTER_7BIT ${CONFIG_FILTER_7BIT}
+#define CONFIG_PARALLEL_DEBLOCKING ${CONFIG_PARALLEL_DEBLOCKING}
#define CONFIG_TILE_GROUPS ${CONFIG_TILE_GROUPS}
#define CONFIG_EC_ADAPT ${CONFIG_EC_ADAPT}
+#define CONFIG_SIMP_MV_PRED ${CONFIG_SIMP_MV_PRED}
+#define CONFIG_RD_DEBUG ${CONFIG_RD_DEBUG}
+#define CONFIG_REFERENCE_BUFFER ${CONFIG_REFERENCE_BUFFER}
#endif /* AOM_CONFIG_H */
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
new file mode 100644
index 0000000..70432a2
--- /dev/null
+++ b/build/cmake/aom_config_defaults.cmake
@@ -0,0 +1,135 @@
+##
+## Copyright (c) 2016, Alliance for Open Media. All rights reserved
+##
+## This source code is subject to the terms of the BSD 2 Clause License and
+## the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+## was not distributed with this source code in the LICENSE file, you can
+## obtain it at www.aomedia.org/license/software. If the Alliance for Open
+## Media Patent License 1.0 was not distributed with this source code in the
+## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+##
+
+# Defaults for every libaom configuration variable.
+set(RESTRICT)
+set(INLINE)
+set(ARCH_ARM 0)
+set(ARCH_MIPS 0)
+set(ARCH_X86 0)
+set(ARCH_X86_64 0)
+set(HAVE_EDSP 0)
+set(HAVE_MEDIA 0)
+set(HAVE_NEON 0)
+set(HAVE_NEON_ASM 0)
+set(HAVE_MIPS32 0)
+set(HAVE_DSPR2 0)
+set(HAVE_MSA 0)
+set(HAVE_MIPS64 0)
+set(HAVE_MMX 0)
+set(HAVE_SSE 0)
+set(HAVE_SSE2 0)
+set(HAVE_SSE3 0)
+set(HAVE_SSSE3 0)
+set(HAVE_SSE4_1 0)
+set(HAVE_AVX 0)
+set(HAVE_AVX2 0)
+set(HAVE_AOM_PORTS 0)
+set(HAVE_PTHREAD_H 0)
+set(HAVE_UNISTD_H 0)
+set(CONFIG_DEPENDENCY_TRACKING 1)
+set(CONFIG_EXTERNAL_BUILD 0)
+set(CONFIG_INSTALL_DOCS 0)
+set(CONFIG_INSTALL_BINS 0)
+set(CONFIG_INSTALL_LIBS 0)
+set(CONFIG_INSTALL_SRCS 0)
+set(CONFIG_DEBUG 0)
+set(CONFIG_GPROF 0)
+set(CONFIG_GCOV 0)
+set(CONFIG_RVCT 0)
+set(CONFIG_GCC 0)
+set(CONFIG_MSVS 0)
+set(CONFIG_PIC 0)
+set(CONFIG_BIG_ENDIAN 0)
+set(CONFIG_CODEC_SRCS 0)
+set(CONFIG_DEBUG_LIBS 0)
+set(CONFIG_DEQUANT_TOKENS 0)
+set(CONFIG_DC_RECON 0)
+set(CONFIG_RUNTIME_CPU_DETECT 0)
+set(CONFIG_POSTPROC 0)
+set(CONFIG_AV1_POSTPROC 0)
+set(CONFIG_MULTITHREAD 0)
+set(CONFIG_INTERNAL_STATS 0)
+set(CONFIG_AV1_ENCODER 1)
+set(CONFIG_AV1_DECODER 1)
+set(CONFIG_AV1 1)
+set(CONFIG_ENCODERS 1)
+set(CONFIG_DECODERS 1)
+set(CONFIG_STATIC_MSVCRT 0)
+set(CONFIG_SPATIAL_RESAMPLING 1)
+set(CONFIG_REALTIME_ONLY 0)
+set(CONFIG_ONTHEFLY_BITPACKING 0)
+set(CONFIG_ERROR_CONCEALMENT 0)
+set(CONFIG_SHARED 0)
+set(CONFIG_STATIC 1)
+set(CONFIG_SMALL 0)
+set(CONFIG_POSTPROC_VISUALIZER 0)
+set(CONFIG_OS_SUPPORT 0)
+set(CONFIG_UNIT_TESTS 0)
+set(CONFIG_WEBM_IO 1)
+set(CONFIG_LIBYUV 1)
+set(CONFIG_ACCOUNTING 0)
+set(CONFIG_DECODE_PERF_TESTS 0)
+set(CONFIG_ENCODE_PERF_TESTS 0)
+set(CONFIG_MULTI_RES_ENCODING 0)
+set(CONFIG_TEMPORAL_DENOISING 1)
+set(CONFIG_AV1_TEMPORAL_DENOISING 0)
+set(CONFIG_COEFFICIENT_RANGE_CHECKING 0)
+set(CONFIG_AOM_HIGHBITDEPTH 0)
+set(CONFIG_BETTER_HW_COMPATIBILITY 0)
+set(CONFIG_EXPERIMENTAL 0)
+set(CONFIG_SIZE_LIMIT 0)
+set(CONFIG_AOM_QM 0)
+set(CONFIG_FP_MB_STATS 0)
+set(CONFIG_EMULATE_HARDWARE 0)
+set(CONFIG_CLPF 0)
+set(CONFIG_DERING 0)
+set(CONFIG_VAR_TX 0)
+set(CONFIG_RECT_TX 0)
+set(CONFIG_REF_MV 0)
+set(CONFIG_DUAL_FILTER 0)
+set(CONFIG_EXT_TX 0)
+set(CONFIG_TX64X64 0)
+set(CONFIG_SUB8X8_MC 0)
+set(CONFIG_EXT_INTRA 0)
+set(CONFIG_FILTER_INTRA 0)
+set(CONFIG_EXT_INTER 0)
+set(CONFIG_EXT_INTERP 0)
+set(CONFIG_EXT_REFS 0)
+set(CONFIG_GLOBAL_MOTION 0)
+set(CONFIG_NEW_QUANT 0)
+set(CONFIG_SUPERTX 0)
+set(CONFIG_ANS 0)
+set(CONFIG_EC_MULTISYMBOL 1)
+set(CONFIG_LOOP_RESTORATION 0)
+set(CONFIG_EXT_PARTITION 0)
+set(CONFIG_EXT_PARTITION_TYPES 0)
+set(CONFIG_EXT_TILE 0)
+set(CONFIG_MOTION_VAR 0)
+set(CONFIG_WARPED_MOTION 0)
+set(CONFIG_ENTROPY 0)
+set(CONFIG_BIDIR_PRED 0)
+set(CONFIG_BITSTREAM_DEBUG 0)
+set(CONFIG_ALT_INTRA 0)
+set(CONFIG_PALETTE 0)
+set(CONFIG_DAALA_EC 1)
+set(CONFIG_PVQ 0)
+set(CONFIG_CB4X4 0)
+set(CONFIG_FRAME_SIZE 0)
+set(CONFIG_DELTA_Q 0)
+set(CONFIG_ADAPT_SCAN 0)
+set(CONFIG_FILTER_7BIT 0)
+set(CONFIG_PARALLEL_DEBLOCKING 0)
+set(CONFIG_TILE_GROUPS 0)
+set(CONFIG_EC_ADAPT 0)
+set(CONFIG_SIMP_MV_PRED 0)
+set(CONFIG_RD_DEBUG 0)
+set(CONFIG_REFERENCE_BUFFER 0)
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 9494c8f..774a28f 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -10,6 +10,7 @@
##
cmake_minimum_required(VERSION 3.2)
+include("${AOM_ROOT}/build/cmake/aom_config_defaults.cmake")
include("${AOM_ROOT}/build/cmake/compiler_flags.cmake")
include("${AOM_ROOT}/build/cmake/targets/${AOM_TARGET}.cmake")
@@ -20,108 +21,6 @@
include(FindGit)
include(FindPerl)
-# Defaults for every libaom configuration variable.
-set(RESTRICT)
-set(INLINE)
-set(ARCH_ARM 0)
-set(ARCH_MIPS 0)
-set(ARCH_X86 0)
-set(ARCH_X86_64 0)
-set(HAVE_EDSP 0)
-set(HAVE_MEDIA 0)
-set(HAVE_NEON 0)
-set(HAVE_NEON_ASM 0)
-set(HAVE_MIPS32 0)
-set(HAVE_DSPR2 0)
-set(HAVE_MSA 0)
-set(HAVE_MIPS64 0)
-set(HAVE_MMX 0)
-set(HAVE_SSE 0)
-set(HAVE_SSE2 0)
-set(HAVE_SSE3 0)
-set(HAVE_SSSE3 0)
-set(HAVE_SSE4_1 0)
-set(HAVE_AVX 0)
-set(HAVE_AVX2 0)
-set(HAVE_AOM_PORTS 0)
-set(HAVE_PTHREAD_H 0)
-set(HAVE_UNISTD_H 0)
-set(CONFIG_DEPENDENCY_TRACKING 1)
-set(CONFIG_EXTERNAL_BUILD 0)
-set(CONFIG_INSTALL_DOCS 0)
-set(CONFIG_INSTALL_BINS 0)
-set(CONFIG_INSTALL_LIBS 0)
-set(CONFIG_INSTALL_SRCS 0)
-set(CONFIG_USE_X86INC 0)
-set(CONFIG_DEBUG 0)
-set(CONFIG_GPROF 0)
-set(CONFIG_GCOV 0)
-set(CONFIG_RVCT 0)
-set(CONFIG_GCC 0)
-set(CONFIG_MSVS 0)
-set(CONFIG_PIC 0)
-set(CONFIG_BIG_ENDIAN 0)
-set(CONFIG_CODEC_SRCS 0)
-set(CONFIG_DEBUG_LIBS 0)
-set(CONFIG_DEQUANT_TOKENS 0)
-set(CONFIG_DC_RECON 0)
-set(CONFIG_RUNTIME_CPU_DETECT 0)
-set(CONFIG_MULTITHREAD 0)
-set(CONFIG_INTERNAL_STATS 0)
-set(CONFIG_AV1_ENCODER 1)
-set(CONFIG_AV1_DECODER 1)
-set(CONFIG_AV1 1)
-set(CONFIG_ENCODERS 1)
-set(CONFIG_DECODERS 1)
-set(CONFIG_STATIC_MSVCRT 0)
-set(CONFIG_SPATIAL_RESAMPLING 1)
-set(CONFIG_REALTIME_ONLY 0)
-set(CONFIG_ONTHEFLY_BITPACKING 0)
-set(CONFIG_ERROR_CONCEALMENT 0)
-set(CONFIG_SHARED 0)
-set(CONFIG_STATIC 1)
-set(CONFIG_SMALL 0)
-set(CONFIG_OS_SUPPORT 0)
-set(CONFIG_UNIT_TESTS 0)
-set(CONFIG_WEBM_IO 0)
-set(CONFIG_LIBYUV 0)
-set(CONFIG_ACCOUNTING 0)
-set(CONFIG_DECODE_PERF_TESTS 0)
-set(CONFIG_ENCODE_PERF_TESTS 0)
-set(CONFIG_MULTI_RES_ENCODING 0)
-set(CONFIG_TEMPORAL_DENOISING 1)
-set(CONFIG_COEFFICIENT_RANGE_CHECKING 0)
-set(CONFIG_AOM_HIGHBITDEPTH 0)
-set(CONFIG_EXPERIMENTAL 0)
-set(CONFIG_SIZE_LIMIT 0)
-set(CONFIG_AOM_QM 0)
-set(CONFIG_SPATIAL_SVC 0)
-set(CONFIG_FP_MB_STATS 0)
-set(CONFIG_EMULATE_HARDWARE 0)
-set(CONFIG_CLPF 0)
-set(CONFIG_DERING 0)
-set(CONFIG_REF_MV 0)
-set(CONFIG_SUB8X8_MC 0)
-set(CONFIG_EXT_INTRA 0)
-set(CONFIG_EXT_INTERP 0)
-set(CONFIG_EXT_TX 0)
-set(CONFIG_MOTION_VAR 0)
-set(CONFIG_EXT_REFS 0)
-set(CONFIG_EXT_COMPOUND 0)
-set(CONFIG_SUPERTX 0)
-set(CONFIG_ANS 0)
-set(CONFIG_EC_MULTISYMBOL 0)
-set(CONFIG_DAALA_EC 0)
-set(CONFIG_PARALLEL_DEBLOCKING 0)
-set(CONFIG_CB4X4 0)
-set(CONFIG_PALETTE 0)
-set(CONFIG_FRAME_SIZE 0)
-set(CONFIG_FILTER_7BIT 0)
-set(CONFIG_DELTA_Q 0)
-set(CONFIG_ADAPT_SCAN 0)
-set(CONFIG_BITSTREAM_DEBUG 0)
-set(CONFIG_TILE_GROUPS 0)
-set(CONFIG_EC_ADAPT 0)
# TODO(tomfinegan): consume trailing whitespace after configure_file() when
# target platform check produces empty INLINE and RESTRICT values (aka empty
