Subject: [PATCH] fix for vcpkg fix missing mfx_driver_store_loader related symbols --- Index: CMakeLists.txt IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt (revision 7e4d221c36c630c1250b23a5dfa15657bc04c10c) +++ b/CMakeLists.txt (revision 5ebef171699530ca01594a5cef10a68811f4d105) @@ -40,6 +39,7 @@ src/mfx_load_plugin.cpp src/mfx_plugin_hive.cpp src/mfx_win_reg_key.cpp + src/mfx_driver_store_loader.cpp ) endif (CMAKE_SYSTEM_NAME MATCHES "Windows") @@ -56,6 +56,12 @@ configure_file (${CMAKE_SOURCE_DIR}/libmfx.pc.cmake ${CMAKE_BINARY_DIR}/libmfx.pc @ONLY) add_library( mfx STATIC ${SOURCES} ) + +if (CMAKE_SYSTEM_NAME MATCHES "Windows") + set_target_properties(mfx + PROPERTIES PREFIX lib) +endif (CMAKE_SYSTEM_NAME MATCHES "Windows") + install (DIRECTORY ${CMAKE_SOURCE_DIR}/mfx DESTINATION ${CMAKE_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h") install (FILES ${CMAKE_BINARY_DIR}/libmfx.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) install (TARGETS mfx ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) Index: libmfx.pc.cmake IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/libmfx.pc.cmake b/libmfx.pc.cmake --- a/libmfx.pc.cmake (revision 7e4d221c36c630c1250b23a5dfa15657bc04c10c) +++ b/libmfx.pc.cmake (revision 388559e9e8234eb0989e1598a9beea4035a04132) @@ -9,6 +9,6 @@ Requires: Requires.private: Conflicts: -Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.a +Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib Libs.private: Cflags: -I${includedir} -I@INTELMEDIASDK_PATH@ Index: src/mfx_driver_store_loader.cpp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/src/mfx_driver_store_loader.cpp b/src/mfx_driver_store_loader.cpp --- a/src/mfx_driver_store_loader.cpp (revision 388559e9e8234eb0989e1598a9beea4035a04132) +++ b/src/mfx_driver_store_loader.cpp (revision 5ebef171699530ca01594a5cef10a68811f4d105) @@ -24,6 +24,8 @@ #include "mfx_dispatcher_log.h" #include "mfx_load_dll.h" +#pragma comment(lib, "Ole32.lib") + namespace MFX { =================================================================== 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 @@ -11,4 +11,4 @@ Requires.private: Conflicts: Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib Libs.private: -Cflags: -I${includedir} -I@INTELMEDIASDK_PATH@ +Cflags: -I${includedir}