Commit 88ea6352 authored by Tom Finegan's avatar Tom Finegan

Fix CMake shared library build.

The post relocation destination of some non-simd sources
that require specific simd flavors was incorrect. The
relocated sources touch internal APIs, and the incorrect
destination was an unguarded area where sources are added
unconditionally to targets with the assumption that all
APIs are accessible.

Sources moved to section guarded by BUILD_SHARED_LIBS, which
acts as the border between public APIs always available for
testing and those that require a static lib that exposes
private symbols.

Change-Id: I5d9ad513a0fe1b9dc57cb11cca53e8d00eb9b1a8
parent 8b730a5a
......@@ -35,38 +35,38 @@ set(AOM_UNIT_TEST_COMMON_SOURCES
"${AOM_ROOT}/test/util.h"
"${AOM_ROOT}/test/video_source.h")
if (HAVE_NEON)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_neon_test.cc")
endif ()
if (HAVE_SSE2)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_sse2_test.cc")
endif ()
if (HAVE_SSSE3)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_ssse3_test.cc")
endif ()
if (HAVE_SSE4)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_sse4_test.cc")
endif ()
if (HAVE_AVX2)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_avx2_test.cc")
endif ()
if (NOT BUILD_SHARED_LIBS)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/convolve_test.cc"
"${AOM_ROOT}/test/simd_impl.h")
if (HAVE_NEON)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_neon_test.cc")
endif ()
if (HAVE_SSE2)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_sse2_test.cc")
endif ()
if (HAVE_SSSE3)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_ssse3_test.cc")
endif ()
if (HAVE_SSE4)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_sse4_test.cc")
endif ()
if (HAVE_AVX2)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/simd_avx2_test.cc")
endif ()
if (CONFIG_ACCOUNTING)
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
......
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