From c461a7ea4df3f69722240a1ecc5f7501ce2c8611 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 15 Feb 2011 19:04:51 +0000
Subject: [PATCH] patch from IRIE Shinsuke, use systems openjpeg on *nix.

---
 CMakeLists.txt                   | 11 +++++++++--
 build_files/cmake/RpmBuild.cmake | 17 -----------------
 build_files/cmake/macros.cmake   |  6 ++++++
 extern/CMakeLists.txt            |  2 +-
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 349bbe23ac0..7d60bb70ab5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -933,8 +933,15 @@ if(WITH_RAYOPTIMIZATION)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-	set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
-	set(OPENJPEG_INC ${OPENJPEG})
+	if(UNIX AND NOT APPLE)
+		set(OPENJPEG /usr)
+		set(OPENJPEG_INC ${OPENJPEG}/include)
+		set(OPENJPEG_LIB openjpeg)
+		set(OPENJPEG_LIBPATH ${OPENJPEG}/lib)
+	else()
+		set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
+		set(OPENJPEG_INC ${OPENJPEG})
+	endif()
 endif()
 
 if(WITH_IMAGE_REDCODE)
diff --git a/build_files/cmake/RpmBuild.cmake b/build_files/cmake/RpmBuild.cmake
index 19943fd14cb..90f69d9b334 100644
--- a/build_files/cmake/RpmBuild.cmake
+++ b/build_files/cmake/RpmBuild.cmake
@@ -15,20 +15,3 @@ else ( RPMBUILD )
     message(STATUS "rpmbuild NOT found. RPM generation will not be available")
     set(RPMBUILD_FOUND "NO")
 endif ( RPMBUILD )
-#
-# VLMC RPM Finder
-# Authors: Rohit Yadav <rohityadav89@gmail.com>
-#
-
-find_program(RPMBUILD
-    NAMES rpmbuild
-    PATHS "/usr/bin")
-
-if ( RPMBUILD )
-    get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
-    message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
-    set(RPMBUILD_FOUND "YES")
-else ( RPMBUILD ) 
-    message(STATUS "rpmbuild NOT found. RPM generation will not be available")
-    set(RPMBUILD_FOUND "NO")
-endif ( RPMBUILD )
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index b700fdf2cfa..6fd9fda152b 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -85,6 +85,9 @@ macro(SETUP_LIBDIRS)
 	if(WITH_IMAGE_TIFF)
 		link_directories(${TIFF_LIBPATH})
 	endif()
+	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+		link_directories(${OPENJPEG_LIBPATH})
+	endif()
 	if(WITH_LCMS)
 		link_directories(${LCMS_LIBPATH})
 	endif()
@@ -180,6 +183,9 @@ macro(setup_liblinks
 			target_link_libraries(${target} ${OPENEXR_LIB})
 		endif()
 	endif()
+	if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+		target_link_libraries(${target} ${OPENJPEG_LIB})
+	endif()
 	if(WITH_LCMS)
 		target_link_libraries(${target} ${LCMS_LIBRARY})
 	endif()
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index cdbfa3e0dff..52b804b7bfc 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -37,7 +37,7 @@ endif()
 
 add_subdirectory(glew)
 
-if(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
 	add_subdirectory(libopenjpeg)
 endif()