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

Let bundled JsonCpp satisfy requirement

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-10-11 22:01:39 -04:00
parent 275b944c26
commit 02420885fc
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/CMakeLists.txt
View File

@@ -271,14 +271,22 @@ if (USE_SYSTEM_JSONCPP)
endif ()
if (NOT JSONCPP_FOUND AND NOT DISABLE_BUNDLED_JSONCPP)
message(STATUS "Using embedded JsonCpp (not found or USE_SYSTEM_JSONCPP disabled)")
message(STATUS "Using embedded JsonCpp (not found or USE_SYSTEM_JSONCPP disabled)")
if (NOT TARGET jsoncpp_lib)
add_library(jsoncpp_lib INTERFACE)
target_include_directories(jsoncpp_lib INTERFACE
"${PROJECT_SOURCE_DIR}/thirdparty/jsoncpp")
target_sources(jsoncpp_lib INTERFACE "${PROJECT_SOURCE_DIR}/thirdparty/jsoncpp/jsoncpp.cpp")
target_sources(jsoncpp_lib INTERFACE "${PROJECT_SOURCE_DIR}/thirdparty/jsoncpp/jsoncpp.cpp")
# Because this satisfies the requirement, an installed JsonCpp is optional
set_package_properties(JsonCpp PROPERTIES TYPE OPTIONAL)
endif ()
add_feature_info("JsonCpp (embedded)" TRUE "JsonCpp will be compiled from the bundled sources")
add_feature_info("JsonCpp (embedded)" TRUE "JsonCpp will be compiled from the bundled sources")
endif ()
if (JSONCPP_FOUND)
# JsonCpp is actually required, even though we probe for it optionally
# (This tells feature_summary() to bail if it's not found, later)
set_package_properties(JsonCpp PROPERTIES TYPE REQUIRED)
endif ()
# If we found any usable JsonCpp, use it. Otherwise, bail.
@@ -286,10 +294,6 @@ if (TARGET jsoncpp_lib)
target_link_libraries(openshot PUBLIC jsoncpp_lib)
endif ()
# JsonCpp is actually required, even though we probe for it optionally
# (This tells feature_summary() to bail if it's not found, later)
set_package_properties(JsonCpp PROPERTIES TYPE REQUIRED)
############### LINK LIBRARY #################
SET ( REQUIRED_LIBRARIES
${LIBOPENSHOT_AUDIO_LIBRARIES}