[x265-commits] [x265] cmake: fix 32bit GCC compile

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/b2c148b71db8
branches:  
changeset: 4444:b2c148b71db8
user:      Steve Borho <steve at borho.org>
date:      Mon Oct 14 12:32:48 2013 -0500
description:
cmake: fix 32bit GCC compile
Subject: [x265] cmake: allow MinGW to rename x265-static to x265

details:   http://hg.videolan.org/x265/rev/28e2a3926c95
branches:  
changeset: 4445:28e2a3926c95
user:      Steve Borho <steve at borho.org>
date:      Mon Oct 14 12:34:15 2013 -0500
description:
cmake: allow MinGW to rename x265-static to x265

MinGW uses libx265.dll.a for the shim loader library, which does not collide
with libx265.a, so it is ok.  Only MSVC wants to use x265.lib for both

diffstat:

 source/CMakeLists.txt        |  2 +-
 source/common/CMakeLists.txt |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 5af31960c41d -r 28e2a3926c95 source/CMakeLists.txt
--- a/source/CMakeLists.txt	Mon Oct 14 11:26:23 2013 -0500
+++ b/source/CMakeLists.txt	Mon Oct 14 12:34:15 2013 -0500
@@ -165,7 +165,7 @@ endif()
 target_link_libraries(x265-shared ${EXTRA_LIBS})
 target_link_libraries(x265-static ${EXTRA_LIBS})
 set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
-if(NOT WIN32)
+if(NOT MSVC)
     set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)
 endif()
 if(UNIX AND NOT CLANG)
diff -r 5af31960c41d -r 28e2a3926c95 source/common/CMakeLists.txt
--- a/source/common/CMakeLists.txt	Mon Oct 14 11:26:23 2013 -0500
+++ b/source/common/CMakeLists.txt	Mon Oct 14 12:34:15 2013 -0500
@@ -217,7 +217,7 @@ if(GCC)
     endif()
     set_source_files_properties(cpu.cpp PROPERTIES COMPILE_FLAGS -Wno-narrowing)
 endif(GCC)
-set_source_files_properties(common.cpp PROPERTIES COMPILE_FLAGS -DX265_VERSION=${X265_VERSION})
+add_definitions(-DX265_VERSION=${X265_VERSION})
 
 enable_language(ASM_YASM)
 add_library(common OBJECT