[SCM] libopenshot-audio/master: Use the system libraries

ghisvail-guest at users.alioth.debian.org ghisvail-guest at users.alioth.debian.org
Thu Feb 2 17:35:18 UTC 2017


The following commit has been merged in the master branch:
commit a50e6a6ae89cda560282566f8992194809447a85
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Feb 2 16:21:52 2017 +0000

    Use the system libraries

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6c8f54..b7742f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,6 +172,37 @@ TARGET_LINK_LIBRARIES(openshot-audio
 	${JUCE_PLATFORM_SPECIFIC_LIBRARIES}
 )
 
+find_package(ZLIB REQUIRED)
+if(NOT TARGET ZLIB::ZLIB)
+        add_library(ZLIB::ZLIB SHARED IMPORTED)
+        set_target_properties(ZLIB::ZLIB PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}"
+                IMPORTED_LOCATION "${ZLIB_LIBRARIES}")
+endif()
+target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_ZLIB_CODE=0")
+target_link_libraries(openshot-audio ZLIB::ZLIB)
+
+find_package(JPEG REQUIRED)
+if(NOT TARGET JPEG::JPEG)
+        add_library(JPEG::JPEG SHARED IMPORTED)
+        set_target_properties(JPEG::JPEG PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIRS}"
+                IMPORTED_LOCATION "${JPEG_LIBRARIES}")
+endif()
+target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_JPEGLIB_CODE=0")
+target_link_libraries(openshot-audio JPEG::JPEG)
+
+find_package(PNG REQUIRED)
+if(NOT TARGET PNG::PNG)
+        add_library(PNG::PNG SHARED IMPORTED)
+        set_target_properties(PNG::PNG PROPERTIES
+                INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+                INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
+                IMPORTED_LOCATION "${PNG_LIBRARIES}")
+endif()
+target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_PNGLIB_CODE=0")
+target_link_libraries(openshot-audio PNG::PNG)
+
 # PROCESS SUB-DIRECTORIES
 add_subdirectory(src)
 

-- 
libopenshot-audio packaging



More information about the pkg-multimedia-commits mailing list