[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34876] trunk/blender: patch from IRIE Shinsuke, use systems openjpeg on *nix.

[Campbell Barton]

Revision: 34876
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34876
Author:   campbellbarton
Date:     2011-02-15 19:04:51 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
patch from IRIE Shinsuke, use systems openjpeg on *nix.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/RpmBuild.cmake
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/extern/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-02-15 19:04:00 UTC (rev 34875)
+++ trunk/blender/CMakeLists.txt	2011-02-15 19:04:51 UTC (rev 34876)
@@ -933,8 +933,15 @@
 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)

Modified: trunk/blender/build_files/cmake/RpmBuild.cmake
===================================================================
--- trunk/blender/build_files/cmake/RpmBuild.cmake	2011-02-15 19:04:00 UTC (rev 34875)
+++ trunk/blender/build_files/cmake/RpmBuild.cmake	2011-02-15 19:04:51 UTC (rev 34876)
@@ -15,20 +15,3 @@
     message(STATUS "rpmbuild NOT found. RPM generation will not be available")
     set(RPMBUILD_FOUND "NO")
 endif ( RPMBUILD )
-#
-# VLMC RPM Finder
-# Authors: Rohit Yadav <rohityadav89 at 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 )

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-02-15 19:04:00 UTC (rev 34875)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-02-15 19:04:51 UTC (rev 34876)
@@ -85,6 +85,9 @@
 	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 @@
 			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()

Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt	2011-02-15 19:04:00 UTC (rev 34875)
+++ trunk/blender/extern/CMakeLists.txt	2011-02-15 19:04:51 UTC (rev 34876)
@@ -37,7 +37,7 @@
 
 add_subdirectory(glew)
 
-if(WITH_IMAGE_OPENJPEG)
+if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
 	add_subdirectory(libopenjpeg)
 endif()