# HG changeset patch
# User Pradeep Ramachandran <[email protected]>
# Date 1458185054 -19800
# Thu Mar 17 08:54:14 2016 +0530
# Node ID cb9a50f36ac6fb5ae60d08f51f4ca27eb9f02eb2
# Parent b09998b1256ed8e652c4bf2d688cbfab3a84d5cd
cmake: Export PLATFORM_LIBS only if x265 has a parent scope
diff -r b09998b1256e -r cb9a50f36ac6 source/CMakeLists.txt
--- a/source/CMakeLists.txt Wed Mar 16 14:24:48 2016 +0530
+++ b/source/CMakeLists.txt Thu Mar 17 08:54:14 2016 +0530
@@ -618,5 +618,10 @@
endif()
endif()
-LIST(REMOVE_DUPLICATES PLATFORM_LIBS)
-set(PLATFORM_LIBS ${PLATFORM_LIBS} PARENT_SCOPE)
+get_directory_property(hasParent PARENT_DIRECTORY)
+if(hasParent)
+ if(PLATFORM_LIBS)
+ LIST(REMOVE_DUPLICATES PLATFORM_LIBS)
+ set(PLATFORM_LIBS ${PLATFORM_LIBS} PARENT_SCOPE)
+ endif(PLATFORM_LIBS)
+endif(hasParent)
# HG changeset patch
# User Pradeep Ramachandran <[email protected]>
# Date 1458185054 -19800
# Thu Mar 17 08:54:14 2016 +0530
# Node ID cb9a50f36ac6fb5ae60d08f51f4ca27eb9f02eb2
# Parent b09998b1256ed8e652c4bf2d688cbfab3a84d5cd
cmake: Export PLATFORM_LIBS only if x265 has a parent scope
diff -r b09998b1256e -r cb9a50f36ac6 source/CMakeLists.txt
--- a/source/CMakeLists.txt Wed Mar 16 14:24:48 2016 +0530
+++ b/source/CMakeLists.txt Thu Mar 17 08:54:14 2016 +0530
@@ -618,5 +618,10 @@
endif()
endif()
-LIST(REMOVE_DUPLICATES PLATFORM_LIBS)
-set(PLATFORM_LIBS ${PLATFORM_LIBS} PARENT_SCOPE)
+get_directory_property(hasParent PARENT_DIRECTORY)
+if(hasParent)
+ if(PLATFORM_LIBS)
+ LIST(REMOVE_DUPLICATES PLATFORM_LIBS)
+ set(PLATFORM_LIBS ${PLATFORM_LIBS} PARENT_SCOPE)
+ endif(PLATFORM_LIBS)
+endif(hasParent)
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
