mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 13:59:02 +08:00
1b4d69f302
* [amd-amf] Update to 1.4.29 * [ffnvcodec] Update to 11.1.5.2 * [mfx-dispatch] Fix pkgconfig * [ffmpeg] Update to 6.0 * update versions * [amd-amd] Fix merge * Update ffmpeg.json * ffmpeg: Remove libpng dependency. Ffmpeg doesnt have a libpng dependency. All thats needed for png support is zlib which has its own option already * Update ffmpeg.json * [ignition-common3] patch for ffmpeg3 * [freerdp] Update to 2.11.1 * Revert "Merge pull request #1 from autoantwort/ffmpeg" This reverts commitb52416c67d, reversing changes made to8fdd44e901. * Update ffmpeg.json * Update ffmpeg.json --------- Co-authored-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9446bc4..a8a3288 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -3,16 +3,7 @@ cmake_minimum_required(VERSION 2.6)
|
|
project( libmfx )
|
|
|
|
# FIXME Adds support for using system/other install of intel media sdk
|
|
-find_path ( INTELMEDIASDK_PATH mfx/mfxvideo.h
|
|
- HINTS "${CMAKE_SOURCE_DIR}"
|
|
-)
|
|
-
|
|
-if (INTELMEDIASDK_PATH_NOTFOUND)
|
|
- message( FATAL_ERROR "Intel MEDIA SDK include not found" )
|
|
-else (INTELMEDIASDK_PATH_NOTFOUND)
|
|
- message(STATUS "Intel Media SDK is here: ${INTELMEDIASDK_PATH}")
|
|
-endif (INTELMEDIASDK_PATH_NOTFOUND)
|
|
-
|
|
+set(INTELMEDIASDK_PATH "${CMAKE_CURRENT_LIST_DIR}")
|
|
|
|
set(SOURCES
|
|
src/main.cpp
|
|
diff --git a/libmfx.pc.cmake b/libmfx.pc.cmake
|
|
index fabb541..5d248fe 100644
|
|
--- a/libmfx.pc.cmake
|
|
+++ b/libmfx.pc.cmake
|
|
@@ -6,9 +6,9 @@ Requires.private:
|
|
Name: libmfx
|
|
Description: Intel Media SDK Dispatched static library
|
|
-Version: 2013
|
|
+Version: 1.35
|
|
Requires:
|
|
Requires.private:
|
|
Conflicts:
|
|
-Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib
|
|
+Libs: -L${libdir} ${libdir}/libmfx.lib
|
|
Libs.private:
|
|
-Cflags: -I${includedir} -I@INTELMEDIASDK_PATH@
|
|
+Cflags: -I${includedir}
|