[x265-commits] [x265] cmake: keep all linker options in list, fixes multilib link

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/83bc6fac1fb5
branches:  
changeset: 10779:83bc6fac1fb5
user:      Steve Borho <steve at borho.org>
date:      Wed Jul 08 13:35:39 2015 -0500
description:
cmake: keep all linker options in list, fixes multilib link

diffstat:

 build/linux/multilib.sh |  2 +-
 source/CMakeLists.txt   |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 590a61a07303 -r 83bc6fac1fb5 build/linux/multilib.sh
--- a/build/linux/multilib.sh	Wed Jul 08 12:00:38 2015 -0500
+++ b/build/linux/multilib.sh	Wed Jul 08 13:35:39 2015 -0500
@@ -13,5 +13,5 @@ make ${MAKEFLAGS}
 cd ../8bit
 ln -sf ../10bit/libx265.a libx265_main10.a
 ln -sf ../12bit/libx265.a libx265_main12.a
-cmake ../../../source -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF
+cmake ../../../source -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON
 make ${MAKEFLAGS}
diff -r 590a61a07303 -r 83bc6fac1fb5 source/CMakeLists.txt
--- a/source/CMakeLists.txt	Wed Jul 08 12:00:38 2015 -0500
+++ b/source/CMakeLists.txt	Wed Jul 08 13:35:39 2015 -0500
@@ -449,7 +449,7 @@ if(ENABLE_SHARED)
         if(APPLE)
             set_target_properties(x265-shared PROPERTIES MACOSX_RPATH 1)
         else()
-            set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
+            list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
         endif()
     endif()
     set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})