You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.5 KiB
31 lines
1.5 KiB
10 years ago
|
diff -up multicoreware-x265-d6257335c537/source/CMakeLists.txt.soname multicoreware-x265-d6257335c537/source/CMakeLists.txt
|
||
|
|
--- multicoreware-x265-d6257335c537/source/CMakeLists.txt.soname 2014-08-08 11:55:36.315572972 +0200
|
||
|
|
+++ multicoreware-x265-d6257335c537/source/CMakeLists.txt 2014-08-08 11:55:36.316572975 +0200
|
||
|
|
@@ -276,15 +276,22 @@ if(ENABLE_SHARED)
|
||
|
|
else()
|
||
|
|
set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
|
||
|
|
endif()
|
||
|
|
- if(UNIX AND NOT APPLE)
|
||
|
|
- set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
|
||
|
|
+ if(UNIX)
|
||
|
|
+ set_target_properties(x265-shared PROPERTIES VERSION ${X265_BUILD})
|
||
|
|
+ if(NOT APPLE)
|
||
|
|
+ set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
|
||
|
|
+ endif()
|
||
|
|
endif()
|
||
|
|
+ set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
|
||
|
|
if(X265_LATEST_TAG)
|
||
|
|
+ if(WINDOWS)
|
||
|
|
+ set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG})
|
||
|
|
+ endif()
|
||
|
|
# shared library is not installed if a tag is not found
|
||
|
|
- set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION ${X265_BUILD})
|
||
|
|
install(TARGETS x265-shared
|
||
|
|
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
||
|
|
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
||
|
|
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||
|
|
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|