From 34c006fcc416905dc502424f23f92919c503b159 Mon Sep 17 00:00:00 2001 From: Marian Zajko Date: Mon, 25 Jan 2016 11:05:55 +0100 Subject: [PATCH 1/2] Fixed ximea cmake settings Fixed ximea cmake settings for 32bit win build and linux. --- modules/videoio/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index b5da8d090d..1a3449e3b5 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -131,10 +131,12 @@ if(HAVE_XIMEA) endif() if(WIN32 AND X86_64) list(APPEND VIDEOIO_LIBRARIES xiapi64) + elseif(WIN32) + list(APPEND VIDEOIO_LIBRARIES xiapi32) elseif(APPLE) list(APPEND VIDEOIO_LIBRARIES "-framework m3api") else() - list(APPEND VIDEOIO_LIBRARIES xiapi32) + list(APPEND VIDEOIO_LIBRARIES m3api) endif() endif(HAVE_XIMEA) From a387d6fa267c286b3178d604782594c3dbf8372e Mon Sep 17 00:00:00 2001 From: Marian Zajko Date: Mon, 25 Jan 2016 13:13:13 +0100 Subject: [PATCH 2/2] - removed whitespaces --- modules/videoio/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index 1a3449e3b5..41b0691b75 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -132,7 +132,7 @@ if(HAVE_XIMEA) if(WIN32 AND X86_64) list(APPEND VIDEOIO_LIBRARIES xiapi64) elseif(WIN32) - list(APPEND VIDEOIO_LIBRARIES xiapi32) + list(APPEND VIDEOIO_LIBRARIES xiapi32) elseif(APPLE) list(APPEND VIDEOIO_LIBRARIES "-framework m3api") else()