20 lines
855 B
Diff
20 lines
855 B
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 8f459f39c4..d8c1bb2b02 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -286,12 +286,12 @@ add_library(aom ${target_objs_aom} $<TARGET_OBJECTS:aom_rtcd>)
|
||
|
|
|
||
|
|
if(BUILD_SHARED_LIBS)
|
||
|
|
add_library(aom_static STATIC ${target_objs_aom} $<TARGET_OBJECTS:aom_rtcd>)
|
||
|
|
- set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom)
|
||
|
|
+ set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom_static)
|
||
|
|
if(MSVC OR (WIN32 AND NOT MINGW))
|
||
|
|
# Fix race condition on the export library file between the two versions.
|
||
|
|
# Affects MSVC in all three flavors (stock, Clang/CL, LLVM-- the latter sets
|
||
|
|
# MSVC and MINGW both to FALSE).
|
||
|
|
- set_target_properties(aom PROPERTIES ARCHIVE_OUTPUT_NAME "aom_dll")
|
||
|
|
+ set_target_properties(aom PROPERTIES ARCHIVE_OUTPUT_NAME "aom")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(NOT MSVC)
|