Commit 2e9773f0 authored by Tom Finegan's avatar Tom Finegan
Browse files

Require explicit request for generic CPU at cmake generation time.

x86 and x86_64 support is now working for most platforms. Remove the
automatic fallback to a generic unoptimized build, and require users
to explicitly request generic to build a generic library and tools.

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76

Change-Id: I7b36394dc28aa9b729d2b2504146d02f017c9a0b
parent b353a8ed
...@@ -34,9 +34,11 @@ endif () ...@@ -34,9 +34,11 @@ endif ()
set(AOM_TARGET_SYSTEM ${CMAKE_SYSTEM_NAME}) set(AOM_TARGET_SYSTEM ${CMAKE_SYSTEM_NAME})
if (NOT EXISTS "${AOM_ROOT}/build/cmake/targets/${AOM_TARGET_CPU}.cmake") if (NOT EXISTS "${AOM_ROOT}/build/cmake/targets/${AOM_TARGET_CPU}.cmake")
message("No RTCD template for ${AOM_TARGET_CPU}, using generic.") message(FATAL_ERROR "No RTCD template for ${AOM_TARGET_CPU}. Create one, or "
set(AOM_TARGET_CPU "generic") "add -DAOM_TARGET_CPU=generic to your cmake command line for a "
"generic build of libaom and tools.")
endif () endif ()
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")
find_program(YASM_EXECUTABLE yasm $ENV{YASM_PATH}) find_program(YASM_EXECUTABLE yasm $ENV{YASM_PATH})
if (NOT YASM_EXECUTABLE) if (NOT YASM_EXECUTABLE)
......
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