Remove local variables from CMAKE namespace
authorAlexander Nitsch <nitsch@ht.tu-berlin.de>
Tue, 17 Mar 2015 12:52:59 +0000 (13:52 +0100)
committerAlexander Nitsch <nitsch@ht.tu-berlin.de>
Mon, 30 Mar 2015 22:05:48 +0000 (00:05 +0200)
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectCXXCompiler.cmake

index cf45eb6..4f0e398 100644 (file)
@@ -87,9 +87,9 @@ elseif(MINGW)
   set(OpenCV_RUNTIME mingw)
 
   execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
-                  OUTPUT_VARIABLE CMAKE_OPENCV_GCC_TARGET_MACHINE
+                  OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "amd64|x86_64|AMD64")
+  if(OPENCV_GCC_TARGET_MACHINE MATCHES "amd64|x86_64|AMD64")
     set(MINGW64 1)
     set(OpenCV_ARCH x64)
   else()
index 361178b..8713318 100644 (file)
@@ -91,9 +91,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
 
   if(WIN32)
     execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
-              OUTPUT_VARIABLE CMAKE_OPENCV_GCC_TARGET_MACHINE
+              OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
               OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "amd64|x86_64|AMD64")
+    if(OPENCV_GCC_TARGET_MACHINE MATCHES "amd64|x86_64|AMD64")
       set(MINGW64 1)
     endif()
   endif()