Commit 660064a9 authored by Tom Finegan's avatar Tom Finegan
Browse files

Sync CMake behavior with configure for CONFIG_WARPED_MOTION.

Disable CONFIG_NCOBMC and CONFIG_NCOBMC_ADAPT_WEIGHT when
CONFIG_WARPED_MOTION is enabled.

BUG=aomedia:683

Change-Id: Id676daaef89b6364579707ecd16826715b641ac2
parent 9bc86c2b
...@@ -283,6 +283,15 @@ if (CONFIG_GPROF) ...@@ -283,6 +283,15 @@ if (CONFIG_GPROF)
require_compiler_flag("-pg" YES) require_compiler_flag("-pg" YES)
endif () endif ()
if (CONFIG_WARPED_MOTION)
if (CONFIG_NCOBMC)
change_config_and_warn(CONFIG_NCOBMC 0 CONFIG_WARPED_MOTION)
endif ()
if (CONFIG_NCOBMC_ADAPT_WEIGHT)
change_config_and_warn(CONFIG_NCOBMC_ADAPT_WEIGHT 0 CONFIG_WARPED_MOTION)
endif ()
endif ()
if (NOT MSVC) if (NOT MSVC)
aom_push_var(CMAKE_REQUIRED_LIBRARIES "m") aom_push_var(CMAKE_REQUIRED_LIBRARIES "m")
aom_check_c_compiles("fenv_check" aom_check_c_compiles("fenv_check"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment