mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 22:13:48 +08:00
58 lines
2.6 KiB
Diff
58 lines
2.6 KiB
Diff
|
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
|
||
|
|
index 799592b..3f44173 100644
|
||
|
|
--- a/cmake/OpenCVModule.cmake
|
||
|
|
+++ b/cmake/OpenCVModule.cmake
|
||
|
|
@@ -852,7 +852,7 @@ macro(ocv_create_module)
|
||
|
|
set(the_module_target ${the_module})
|
||
|
|
endif()
|
||
|
|
|
||
|
|
- if(WINRT)
|
||
|
|
+ if(WINRT AND BUILD_TESTS)
|
||
|
|
# removing APPCONTAINER from modules to run from console
|
||
|
|
# in case of usual starting of WinRT test apps output is missing
|
||
|
|
# so starting of console version w/o APPCONTAINER is required to get test results
|
||
|
|
@@ -1175,7 +1175,7 @@ function(ocv_add_perf_tests)
|
||
|
|
set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
- if(WINRT)
|
||
|
|
+ if(WINRT AND BUILD_TESTS)
|
||
|
|
# removing APPCONTAINER from tests to run from console
|
||
|
|
# look for detailed description inside of ocv_create_module macro above
|
||
|
|
add_custom_command(TARGET "opencv_perf_${name}"
|
||
|
|
diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp
|
||
|
|
index aafbfdf..10543ae 100644
|
||
|
|
--- a/modules/core/src/utils/datafile.cpp
|
||
|
|
+++ b/modules/core/src/utils/datafile.cpp
|
||
|
|
@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr)
|
||
|
|
CV_UNUSED(addr);
|
||
|
|
#ifdef _WIN32
|
||
|
|
HMODULE m = 0;
|
||
|
|
-#if _WIN32_WINNT >= 0x0501
|
||
|
|
+#if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
|
||
|
|
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
|
||
|
|
reinterpret_cast<LPCTSTR>(addr),
|
||
|
|
&m);
|
||
|
|
@@ -155,7 +155,7 @@ bool getBinLocation(std::wstring& dst)
|
||
|
|
{
|
||
|
|
void* addr = (void*)getModuleLocation; // using code address, doesn't work with static linkage!
|
||
|
|
HMODULE m = 0;
|
||
|
|
-#if _WIN32_WINNT >= 0x0501
|
||
|
|
+#if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
|
||
|
|
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
|
||
|
|
reinterpret_cast<LPCTSTR>(addr),
|
||
|
|
&m);
|
||
|
|
diff --git a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
|
||
|
|
index 236e227..eccf97e 100644
|
||
|
|
--- a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
|
||
|
|
+++ b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
|
||
|
|
@@ -94,7 +94,7 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber()
|
||
|
|
|
||
|
|
void Media::CaptureFrameGrabber::ShowCameraSettings()
|
||
|
|
{
|
||
|
|
-#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
|
||
|
|
+#if (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY != WINAPI_FAMILY_PC_APP)
|
||
|
|
if (_state == State::Started)
|
||
|
|
{
|
||
|
|
CameraOptionsUI::Show(_capture.Get());
|