Tree - rpms/libmediainfo - src.fedoraproject.org

Blob History Raw

		d16b5d7	`diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt`
		d16b5d7	`index 395722e..4a508fe 100755`
		d16b5d7	`--- a/Project/CMake/CMakeLists.txt`
		d16b5d7	`+++ b/Project/CMake/CMakeLists.txt`
		d16b5d7	`@@ -80,7 +80,10 @@ elseif(APPLE)`
		d16b5d7	`endif()`
		d16b5d7
		d16b5d7	`# use bundled tinyxml only if no system`
		d16b5d7	`-find_package(TinyXML REQUIRED)`
		d16b5d7	`+find_package(TinyXML)`
		d16b5d7	`+`
		d16b5d7	`+# use system curl if is present`
		d16b5d7	`+find_package(CURL)`
		d16b5d7
		d16b5d7	`include_directories(${MediaInfoLib_SOURCES_PATH})`
		d16b5d7	`include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/)`
		d16b5d7	`@@ -319,7 +322,13 @@ if(BUILD_ZLIB)`
		d16b5d7	`endif()`
		d16b5d7
		d16b5d7	`# disable some features. Maybe it should be enabled.`
		d16b5d7	`-target_compile_definitions(mediainfo PRIVATE MEDIAINFO_AES_NO MEDIAINFO_LIBMMS_NO MEDIAINFO_LIBCURL_NO)`
		d16b5d7	`+target_compile_definitions(mediainfo PRIVATE MEDIAINFO_AES_NO MEDIAINFO_LIBMMS_NO)`
		d16b5d7	`+if(NOT CURL_FOUND)`
		d16b5d7	`+ target_compile_definitions(mediainfo PRIVATE MEDIAINFO_LIBCURL_NO)`
		d16b5d7	`+else()`
		d16b5d7	`+ include_directories(${CURL_INCLUDE_DIRS})`
		d16b5d7	`+ target_link_libraries(mediainfo "${CURL_LIBRARIES}")`
		d16b5d7	`+endif()`
		d16b5d7
		d16b5d7	`target_include_directories(mediainfo PRIVATE`
		d16b5d7	`${CMAKE_CURRENT_SOURCE_DIR}/../../../ZenLib/Source`