File bcmatroska2-include-subdir.patch of Package bcmatroska2

Overview Repositories Revisions Requests Users Attributes Meta

File bcmatroska2-include-subdir.patch of Package bcmatroska2 (Revision ecfb190c61b436796c3189d905bcf665)

Currently displaying revision ecfb190c61b436796c3189d905bcf665 , Show latest

diff -ru a/BcMatroska2Config.cmake.in b/BcMatroska2Config.cmake.in
--- a/BcMatroska2Config.cmake.in	2021-07-14 11:19:44.426789310 +0200
+++ b/BcMatroska2Config.cmake.in	2021-07-14 11:21:50.035321221 +0200
@@ -39,6 +39,6 @@
 	get_target_property(BCMATROSKA2_LIBRARIES ${BCMATROSKA2_TARGETNAME} LOCATION)
 endif()
 
-set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
+set(BCMATROSKA2_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@/bcmatroska2")
 
 set(BCMATROSKA2_FOUND 1)
diff -ru a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2021-07-14 11:19:44.426789310 +0200
+++ b/CMakeLists.txt	2021-07-14 11:21:14.463170591 +0200
@@ -73,7 +73,7 @@
 add_subdirectory(libmatroska2)
 
 install(FILES ${CMAKE_BINARY_DIR}/config.h
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec
 )
 
 include(CMakePackageConfigHelpers)
diff -ru a/corec/corec/CMakeLists.txt b/corec/corec/CMakeLists.txt
--- a/corec/corec/CMakeLists.txt	2021-07-14 11:19:44.426789310 +0200
+++ b/corec/corec/CMakeLists.txt	2021-07-14 11:22:56.323601950 +0200
@@ -101,18 +101,18 @@
 	memalloc.h
 	memheap.h
 	portab.h
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec
 )
 
-install(FILES array/array.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/array)
-install(FILES helpers/charconvert/charconvert.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/helpers/charconvert)
-install(FILES helpers/date/date.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/helpers/date)
+install(FILES array/array.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/array)
+install(FILES helpers/charconvert/charconvert.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/helpers/charconvert)
+install(FILES helpers/date/date.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/helpers/date)
 install(FILES
 	helpers/file/file.h
 	helpers/file/streams.h
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/helpers/file
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/helpers/file
 )
-install(FILES helpers/md5/md5.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/helpers/md5)
+install(FILES helpers/md5/md5.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/helpers/md5)
 install(FILES
 	helpers/parser/buffer.h
 	helpers/parser/dataheap.h
@@ -122,16 +122,16 @@
 	helpers/parser/strtab.h
 	helpers/parser/strtypes.h
 	helpers/parser/urlpart.h
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/helpers/parser
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/helpers/parser
 )
-install(FILES helpers/system/ccsystem.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/helpers/system)
-install(FILES multithread/multithread.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/multithread)
+install(FILES helpers/system/ccsystem.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/helpers/system)
+install(FILES multithread/multithread.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/multithread)
 install(FILES
 	node/node.h
 	node/node_internal.h
 	node/nodebase.h
 	node/nodetools.h
 	node/nodetree.h
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/node
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/node
 )
-install(FILES str/str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/corec/str)
+install(FILES str/str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2/corec/str)
Binary files a/.git/index and b/.git/index differ
diff -ru a/libebml2/CMakeLists.txt b/libebml2/CMakeLists.txt
--- a/libebml2/CMakeLists.txt	2021-07-14 11:19:44.442789377 +0200
+++ b/libebml2/CMakeLists.txt	2021-07-14 11:20:29.858981710 +0200
@@ -34,5 +34,5 @@
 set_target_properties(ebml2-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 
 install(DIRECTORY ebml
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2
 )
diff -ru a/libmatroska2/CMakeLists.txt b/libmatroska2/CMakeLists.txt
--- a/libmatroska2/CMakeLists.txt	2021-07-14 11:19:44.442789377 +0200
+++ b/libmatroska2/CMakeLists.txt	2021-07-14 11:20:08.898892951 +0200
@@ -76,5 +76,5 @@
 endif()
 
 install(DIRECTORY matroska
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcmatroska2
 )

Places

File bcmatroska2-include-subdir.patch of Package bcmatroska2 (Revision ecfb190c61b436796c3189d905bcf665)

Places