From fd860d7cd0873a511a0b401ab88a7617fb89688f Mon Sep 17 00:00:00 2001 From: Evgeny Agafonchikov Date: Thu, 28 May 2015 16:16:24 +0300 Subject: [PATCH] Adding backslash in macro-based paths of WINRT samples This removes requirement to add OPENCV_WINRT_INSTALL_DIR with backslash in the end in case trailing slash is presented VS handles duplicated slashes w/o issues --- platforms/winrt/readme.txt | 2 +- samples/winrt/FaceDetection/FaceDetection/opencv.props | 6 +++--- .../MediaExtensions/OcvTransform/opencv.props | 6 +++--- samples/winrt/ImageManipulations/opencv.props | 6 +++--- samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj | 6 +++--- .../OcvImageProcessing/OcvImageProcessing/opencv.props | 6 +++--- samples/winrt_universal/PhoneTutorial/opencv.props | 6 +++--- .../VideoCaptureXAML/video_capture_xaml/opencv.props | 6 +++--- .../video_capture_xaml.Windows.vcxproj | 2 +- .../video_capture_xaml.WindowsPhone.vcxproj | 4 ++-- .../PhoneXamlDirect3DApp1Comp/opencv.props | 6 +++--- .../PhoneXamlDirect3DApp1Comp/opencv.props | 6 +++--- samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props | 6 +++--- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/platforms/winrt/readme.txt b/platforms/winrt/readme.txt index 923c7487da..011e449161 100644 --- a/platforms/winrt/readme.txt +++ b/platforms/winrt/readme.txt @@ -57,7 +57,7 @@ bin "-b" flag in the command above builds each generated solutions in both "Debug" and "Release" configurations. It also builds the predefined "INSTALL" project within generated solutions. Building it creates a separate install location that accumulates binaries and includes for specified platforms. Default location is "\bin\install\". -WinRT samples reference 'install' binaries and include files via "OPENCV_WINRT_INSTALL_DIR" environment variable. Please declare it and point to "\bin\install\" directory (note slash at the end) to resolve references within sample applications. +WinRT samples reference 'install' binaries and include files via "OPENCV_WINRT_INSTALL_DIR" environment variable. Please declare it and point to "\bin\install\" directory to resolve references within sample applications. If you don't want to build all configurations automatically, you can omit "-b" flag and build OpenCV.sln for the particular platform you are targeting manually. Due to the current limitations of CMake, separate x86/x64/ARM projects must be generated for each platform. diff --git a/samples/winrt/FaceDetection/FaceDetection/opencv.props b/samples/winrt/FaceDetection/FaceDetection/opencv.props index 61341e2910..1f45f3504a 100644 --- a/samples/winrt/FaceDetection/FaceDetection/opencv.props +++ b/samples/winrt/FaceDetection/FaceDetection/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props index 63acf9e60a..0ddc099609 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt/ImageManipulations/opencv.props b/samples/winrt/ImageManipulations/opencv.props index 5ad46b43df..12821502de 100644 --- a/samples/winrt/ImageManipulations/opencv.props +++ b/samples/winrt/ImageManipulations/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj b/samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj index 8bf1b03d94..550ec83d85 100644 --- a/samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj +++ b/samples/winrt/JavaScript/MediaCaptureJavaScript.jsproj @@ -80,9 +80,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props b/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props index 64b0ac98aa..3931297efb 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt_universal/PhoneTutorial/opencv.props b/samples/winrt_universal/PhoneTutorial/opencv.props index 3c7cac0695..ab4af25953 100644 --- a/samples/winrt_universal/PhoneTutorial/opencv.props +++ b/samples/winrt_universal/PhoneTutorial/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/opencv.props b/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/opencv.props index cd56dfe539..4bd1e9eec2 100644 --- a/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/opencv.props +++ b/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/opencv.props @@ -4,9 +4,9 @@ WP WS - $(OPENCV_WINRT_INSTALL_DIR)$(Runtime)\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_WINRT_INSTALL_DIR)$(Runtime)\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_WINRT_INSTALL_DIR)$(Runtime)\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\$(Runtime)\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\$(Runtime)\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\$(Runtime)\8.1\$(PlatformTarget)\include\ d diff --git a/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.Windows/video_capture_xaml.Windows.vcxproj b/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.Windows/video_capture_xaml.Windows.vcxproj index 042713afeb..2a8a7d0df8 100644 --- a/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.Windows/video_capture_xaml.Windows.vcxproj +++ b/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.Windows/video_capture_xaml.Windows.vcxproj @@ -104,7 +104,7 @@ true - $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\x86\x86\vc12\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86); + $(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\x86\x86\vc12\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86); false diff --git a/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.WindowsPhone/video_capture_xaml.WindowsPhone.vcxproj b/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.WindowsPhone/video_capture_xaml.WindowsPhone.vcxproj index 70a878bfd8..425bb52631 100644 --- a/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.WindowsPhone/video_capture_xaml.WindowsPhone.vcxproj +++ b/samples/winrt_universal/VideoCaptureXAML/video_capture_xaml/video_capture_xaml.WindowsPhone/video_capture_xaml.WindowsPhone.vcxproj @@ -73,10 +73,10 @@ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\x86\x86\vc12\lib;$(VC_LibraryPath_x86);$(WindowsPhoneSDK_LibraryPath_x86); + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.1\x86\x86\vc12\lib;$(VC_LibraryPath_x86);$(WindowsPhoneSDK_LibraryPath_x86); - $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\ARM\ARM\vc12\lib;$(VC_LibraryPath_ARM);$(WindowsPhoneSDK_LibraryPath_arm); + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.1\ARM\ARM\vc12\lib;$(VC_LibraryPath_ARM);$(WindowsPhoneSDK_LibraryPath_arm); diff --git a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props index 360cf6d79a..25161a7d06 100644 --- a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props +++ b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\include\ d diff --git a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props index 21604366f7..203ad9bfbc 100644 --- a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props +++ b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\include\ d diff --git a/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props b/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props index fcd08940b1..c29f8916b0 100644 --- a/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props +++ b/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ - $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ + $(OPENCV_WINRT_INSTALL_DIR)\WP\8.0\$(PlatformTarget)\include\ d