applied CMake-2.4 compatibility patch (by Brian Gerkey)

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

diff --git a/opencv/3rdparty/flann/CMakeLists.txt b/opencv/3rdparty/flann/CMakeLists.txt
index 07af189271c96663e274ce35190d3c736a384763..b4e735aaae34a119e2047b1d281b005a212e80bc 100644 (file)
--- a/opencv/3rdparty/flann/CMakeLists.txt
+++ b/opencv/3rdparty/flann/CMakeLists.txt
@@ -43,9 +43,11 @@ if(MSVC)
     add_definitions(-DJAS_WIN_MSVC_BUILD)
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
+if(UNIX)
+  if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  endif()
 endif()
 
 set_target_properties(${the_target}

diff --git a/opencv/3rdparty/lapack/CMakeLists.txt b/opencv/3rdparty/lapack/CMakeLists.txt
index 37896752a73079f258d72727adc786ea82536455..609265c5a70c362078a8a8f1fcd3db4965f467bf 100644 (file)
--- a/opencv/3rdparty/lapack/CMakeLists.txt
+++ b/opencv/3rdparty/lapack/CMakeLists.txt
@@ -41,8 +41,10 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
+if(UNIX)
+  if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  endif()
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)

diff --git a/opencv/3rdparty/zlib/CMakeLists.txt b/opencv/3rdparty/zlib/CMakeLists.txt
index cfe057cdd1cc763bb7437ab3ad101c1a375ac72d..1594f5e97a0f7e2369c2ac2d8605bc6d45a0c9e4 100644 (file)
--- a/opencv/3rdparty/zlib/CMakeLists.txt
+++ b/opencv/3rdparty/zlib/CMakeLists.txt
@@ -23,8 +23,10 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
+if(UNIX)
+  if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+  endif()
 endif()
 
 set_target_properties(${the_target}