From 6cd06b9861fd2f5305b997c0479b1f6ad67ac72c Mon Sep 17 00:00:00 2001
From: vp153 <vp153@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Date: Wed, 24 Feb 2010 12:12:14 +0000
Subject: [PATCH] simplified complex conditions for better compatibility with
 earlier v. of CMake

git-svn-id: https://code.ros.org/svn/opencv/trunk@2713 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08
---
 opencv/3rdparty/libjasper/CMakeLists.txt | 6 ++++--
 opencv/3rdparty/libjpeg/CMakeLists.txt   | 6 ++++--
 opencv/3rdparty/libpng/CMakeLists.txt    | 6 ++++--
 opencv/3rdparty/libtiff/CMakeLists.txt   | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/opencv/3rdparty/libjasper/CMakeLists.txt b/opencv/3rdparty/libjasper/CMakeLists.txt
index 96da8268..48e33c18 100644
--- a/opencv/3rdparty/libjasper/CMakeLists.txt
+++ b/opencv/3rdparty/libjasper/CMakeLists.txt
@@ -30,8 +30,10 @@ if(MSVC)
     add_definitions(-DJAS_WIN_MSVC_BUILD)
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+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}
diff --git a/opencv/3rdparty/libjpeg/CMakeLists.txt b/opencv/3rdparty/libjpeg/CMakeLists.txt
index 0dde7add..fabfa8fb 100644
--- a/opencv/3rdparty/libjpeg/CMakeLists.txt
+++ b/opencv/3rdparty/libjpeg/CMakeLists.txt
@@ -28,8 +28,10 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+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}
diff --git a/opencv/3rdparty/libpng/CMakeLists.txt b/opencv/3rdparty/libpng/CMakeLists.txt
index 4f6dbfd5..4fb7e6ad 100644
--- a/opencv/3rdparty/libpng/CMakeLists.txt
+++ b/opencv/3rdparty/libpng/CMakeLists.txt
@@ -27,8 +27,10 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+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}
diff --git a/opencv/3rdparty/libtiff/CMakeLists.txt b/opencv/3rdparty/libtiff/CMakeLists.txt
index 6538d0e2..1b2c60c0 100644
--- a/opencv/3rdparty/libtiff/CMakeLists.txt
+++ b/opencv/3rdparty/libtiff/CMakeLists.txt
@@ -74,8 +74,10 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
 endif()
 
-if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+if(UNIX)
+    if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+    endif()
 endif()
 
 add_library(${the_target} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
-- 
2.39.2