From 4ef2f97b0a6201da47d7d7996459e34ac06a0f6a Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 26 Sep 2017 14:10:22 -0400 Subject: [PATCH] matroxsrc: modify FindMatrox.cmake to find 32-bit lib --- cmake/modules/FindMatrox.cmake | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindMatrox.cmake b/cmake/modules/FindMatrox.cmake index 4f7a841..0dc26fb 100644 --- a/cmake/modules/FindMatrox.cmake +++ b/cmake/modules/FindMatrox.cmake @@ -12,7 +12,23 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. if (NOT MATROX_DIR) - set (MATROX_DIR "C:/Program Files/Matrox Imaging/Mil" CACHE PATH "Directory containing Matrox MIL SDK includes and libraries") + # 32-bit dir on win32 + file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES) + # 32-bit dir on win64 + file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86) + # 64-bit dir on win64 + file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432) + + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + set(_PROGFILESDIR "${_PROG_FILES_W6432}") + else () + if (_PROG_FILES_X86) + set(_PROGFILESDIR "${_PROG_FILES_X86}") + else () + set(_PROGFILESDIR "${_PROG_FILES}") + endif () + endif () + set (MATROX_DIR "${_PROGFILESDIR}/Matrox Imaging/Mil" CACHE PATH "Directory containing Matrox MIL SDK includes and libraries") endif () find_path (MATROX_INCLUDE_DIR Mil.h