Fix pull request openMVG#405.

Ye-Tian-Zero · Oct 5, 2015 · 61a32d7 · 61a32d7
1 parent 1435707
commit 61a32d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -361,13 +361,13 @@ IF(OpenMVG_USE_OPENCV)
     MESSAGE(STATUS "OpenCV was not found. Disabling OpenCV support.")
     UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF)
     UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF)
-    # add a definition that allows the conditional compiling
-    ADD_DEFINITIONS(-DHAVE_OPENCV)
   ELSE(NOT OpenCV_FOUND)
     INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
     IF(OpenMVG_USE_OCVSIFT)
       ADD_DEFINITIONS(-DUSE_OCVSIFT)
     ENDIF(OpenMVG_USE_OCVSIFT)
+    # add a definition that allows the conditional compiling
+    ADD_DEFINITIONS(-DHAVE_OPENCV)
   ENDIF(NOT OpenCV_FOUND)
 ENDIF(OpenMVG_USE_OPENCV)
 

diff --git a/src/cmakeFindModules/OptimizeForArchitecture.cmake b/src/cmakeFindModules/OptimizeForArchitecture.cmake
@@ -43,7 +43,7 @@ macro(AutodetectHostArchitecture)
          # Any recent Intel CPU except NetBurst
          if(_cpu_model EQUAL 70) #intel core i7-3720qm MacBook Pro Retina
             set(TARGET_ARCHITECTURE "ivy-bridge")
-         elseif( cpu_model EQUAL 69) # Core i5/i7-4xxxU CPUs
+         elseif(_cpu_model EQUAL 69) # Core i5/i7-4xxxU CPUs
             set(TARGET_ARCHITECTURE "haswell")
          elseif(_cpu_model EQUAL 63) # Xeon E5 series
             set(TARGET_ARCHITECTURE "sandy-bridge")