Fixed whole program optimization flags for VS 8 and VS 9, SF bug 2528221

git-svn-id: https://code.ros.org/svn/opencv/trunk@1533 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 9a230acce422be022115aeb7b761dbc9f396fee8..98cdb90476f1e7e689a82a01261f59d24134b0a6 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -374,20 +374,20 @@ if(MSVC)
     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /W4 /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE")
     # 64-bit portability warnings, in MSVC8
     if(MSVC80)
-        set(EXTRA_C_FLAGS "${OPENCV_EXTRA_CPP_FLAGS} /Wp64")
+        set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} /Wp64")
     endif()
 
     set(EXTRA_EXE_LINKER_FLAGS_RELEASE "${EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
 
     # Whole program optimization
-    if(OPENCV_WHOLE_PROGRAM_OPTIMIZATION AND MSVC80)
+    if(OPENCV_WHOLE_PROGRAM_OPTIMIZATION AND MSVC_VERSION GREATER 1300)
         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /GL")
-        set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
-        set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS} /LTCG")
+        set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
+        set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
     endif()
 
     if(OPENCV_ENABLE_OPENMP)
-        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS} /openmp")
+        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /openmp")
     endif()
 
     # Remove unreferenced functions: function level linking