openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #329 from ferdnyc/cppzmq-detect

Browse Source 
CMakeLists: Also detect cppzmq headers
This commit is contained in:
Jonathan Thomas
2019-10-22 18:32:26 -05:00
committed by GitHub
parent d49dddf79a 9b9e4a7008
commit 144d52d480
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@@ -128,7 +128,7 @@ IF (ENABLE_BLACKMAGIC)
FIND_PACKAGE(BlackMagic)
IF (BLACKMAGIC_FOUND)
# Include headers (needed for compile)
# Include Blackmagic headers (needed for compile)
include_directories(${BLACKMAGIC_INCLUDE_DIR})
# define a global var (used in the C++)
@@ -140,10 +140,17 @@ ENDIF (ENABLE_BLACKMAGIC)
################### ZEROMQ #####################
# Find ZeroMQ library (used for socket communication & logging)
FIND_PACKAGE(ZMQ REQUIRED)
# Some platforms package the header-only cppzmq C++ bindings separately,
# others (Ubuntu) bundle them in with libzmq itself
find_package(cppzmq QUIET)
find_package(ZMQ REQUIRED)
# Include ZeroMQ headers (needed for compile)
include_directories(${ZMQ_INCLUDE_DIRS})
if (cppzmq_FOUND)
include_directories(${cppzmq_INCLUDE_DIRS})
endif()
################### RESVG #####################
# Find resvg library (used for rendering svg files)

7
tests/CMakeLists.txt
View File

@@ -130,10 +130,17 @@ ENDIF (ENABLE_BLACKMAGIC)
################### ZEROMQ #####################
# Find ZeroMQ library (used for socket communication & logging)
# Some platforms package the header-only cppzmq C++ bindings separately,
# others (Ubuntu) bundle them in with libzmq itself
find_package(cppzmq QUIET)
FIND_PACKAGE(ZMQ REQUIRED)
# Include ZeroMQ headers (needed for compile)
include_directories(${ZMQ_INCLUDE_DIRS})
if (cppzmq_FOUND)
include_directories(${cppzmq_INCLUDE_DIRS})
endif()
################### RESVG #####################
# Find resvg library (used for rendering svg files)