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

diff --git a/opencv/3rdparty/libjasper/CMakeLists.txt b/opencv/3rdparty/libjasper/CMakeLists.txt
index 96da8268818797dc09152579a138776b15a45f28..48e33c188f1533a6970b09b4f16b81856fd9c83e 100644 (file)
--- 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 0dde7add6b2f8939aa0dcad8e64a4801b7ce38e2..fabfa8fb8b3a281fa1e944e12714fd6d8132c118 100644 (file)
--- 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 4f6dbfd5f59d108d91215c98eb81c1496924d2af..4fb7e6ade5f091d5027dfd2e8e7aac8f99b13a32 100644 (file)
--- 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 6538d0e2af5cecb2a9d254d4a2087057f385b811..1b2c60c0d3ee33379e6ef6ec24f9584cc3a40485 100644 (file)
--- 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})