Relocate CMake experiment conflict resolution.
Move it to build/cmake/aom_experiment_deps.cmake within the macro fix_experiment_deps() to reduce noise in aom_configure.cmake. Note: This patch also resolves a conflict between the CMake and configure build configs: rect_tx and var_tx conflicts with daala_dctX have been resolved. The two experiments are no longer disabled when daala_dctX is enabled. BUG=aomedia:856 Change-Id: I6f9d127470adc708f547fff3cf5009997bac4c36
Showing with 132 additions and 113 deletions