[Jahshaka-cvs] SF.net SVN: openlibraries: [1394] trunk
Status: Beta
Brought to you by:
jahshaka
Menu
▾
▴
[Jahshaka-cvs] SF.net SVN: openlibraries: [1394] trunk
|
From: <re...@us...> - 2008-06-20 11:32:58
|
Revision: 1394
http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1394&view=rev
Author: rexbron
Date: 2008-06-20 04:32:55 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
Build oil plugins on linux.
Modified Paths:
--------------
trunk/FindOpenEXR.cmake
Added Paths:
-----------
trunk/src/openimagelib/plugins/bmp/CMakeLists.txt
trunk/src/openimagelib/plugins/dds/CMakeLists.txt
trunk/src/openimagelib/plugins/dpx/CMakeLists.txt
trunk/src/openimagelib/plugins/exr/CMakeLists.txt
trunk/src/openimagelib/plugins/hdr/CMakeLists.txt
trunk/src/openimagelib/plugins/png/CMakeLists.txt
trunk/src/openimagelib/plugins/psd/CMakeLists.txt
trunk/src/openimagelib/plugins/sgi/CMakeLists.txt
trunk/src/openimagelib/plugins/tga/CMakeLists.txt
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-06-19 15:10:46.039000034 +0100
committer: Andrew Hunter <an...@ae...>
properties:
branch-nick: trunk
+ timestamp: 2008-06-20 12:32:24.180000067 +0100
committer: Andrew Hunter <an...@ae...>
properties:
branch-nick: trunk
Name: bzr:ancestry:v3-trunk0
- an...@ae...-20080613162705-8emncakb7nkknsbj
an...@ae...-20080614133032-vef9lmcgxyrauqss
an...@ae...-20080614141409-u4z2pzco7bmhavlb
an...@ae...-20080616112610-ky0ylmbwjn9w1mzm
an...@ae...-20080616122604-vyn3c4elr33ehlai
an...@ae...-20080616222235-pb4vb2oeu6cj88m4
an...@ae...-20080618110236-pfuxsos8x3wd285v
an...@ae...-20080618113925-cjg8er4jn4tmc0dm
an...@ae...-20080618182841-z2to60sr79wfdq9o
an...@ae...-20080618190025-f4tqmfnhagk3glij
an...@ae...-20080618195823-74quloizraz2fwj2
an...@ae...-20080619122406-jnh8jzrryfz26k5d
an...@ae...-20080619124658-ma0osj6o1ys7khec
an...@ae...-20080619134156-uy4fm1k8kygexnbq
an...@ae...-20080619134821-m149jig6bmpq41hx
an...@ae...-20080619141005-75220r6w2cvqbj8f
+ an...@ae...-20080613162705-8emncakb7nkknsbj
an...@ae...-20080614133032-vef9lmcgxyrauqss
an...@ae...-20080614141409-u4z2pzco7bmhavlb
an...@ae...-20080616112610-ky0ylmbwjn9w1mzm
an...@ae...-20080616122604-vyn3c4elr33ehlai
an...@ae...-20080616222235-pb4vb2oeu6cj88m4
an...@ae...-20080618110236-pfuxsos8x3wd285v
an...@ae...-20080618113925-cjg8er4jn4tmc0dm
an...@ae...-20080618182841-z2to60sr79wfdq9o
an...@ae...-20080618190025-f4tqmfnhagk3glij
an...@ae...-20080618195823-74quloizraz2fwj2
an...@ae...-20080619122406-jnh8jzrryfz26k5d
an...@ae...-20080619124658-ma0osj6o1ys7khec
an...@ae...-20080619134156-uy4fm1k8kygexnbq
an...@ae...-20080619134821-m149jig6bmpq41hx
an...@ae...-20080619141005-75220r6w2cvqbj8f
an...@ae...-20080620064802-8b2g4wfk32dn8mmz
Name: bzr:file-ids
-
+ src/openimagelib/plugins/bmp/CMakeLists.txt cmakelists.txt-20080620054117-eojq7cb6mkwmdhrt-1
src/openimagelib/plugins/dds/CMakeLists.txt cmakelists.txt-20080620054316-rh0ne5gsqn1wu7x7-1
src/openimagelib/plugins/dpx/CMakeLists.txt cmakelists.txt-20080620053537-iis5yie2yksbjc7s-1
src/openimagelib/plugins/exr/CMakeLists.txt cmakelists.txt-20080620063034-pwotrghy7ty4d9he-1
src/openimagelib/plugins/hdr/CMakeLists.txt cmakelists.txt-20080620063336-38shdw7234ewciiz-1
src/openimagelib/plugins/png/CMakeLists.txt cmakelists.txt-20080620064009-bafahiyohvou2xsb-1
src/openimagelib/plugins/psd/CMakeLists.txt cmakelists.txt-20080620064324-vbvaeoaxtm8km7eg-1
src/openimagelib/plugins/sgi/CMakeLists.txt cmakelists.txt-20080620064519-tohfk8jnqisxmg2u-1
src/openimagelib/plugins/tga/CMakeLists.txt cmakelists.txt-20080620064801-7n6khilt26k2aif8-1
Name: bzr:revision-id:v3-trunk0
- 1373 an...@ae...-20080614130206-thshu8ln95djpgng
1374 an...@ae...-20080616113201-cexl9qhreccah10e
1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7
1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8
1377 an...@ae...-20080616122853-cwqokea7hkf82eo1
1378 an...@ae...-20080616222400-9q0vwtkk6091txce
1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs
1381 an...@ae...-20080618114001-2574od4etx4v8p9h
1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4
1383 an...@ae...-20080618200623-29djr6bh81pmu2mu
1384 an...@ae...-20080618201105-neebgl19i1lbskta
1386 an...@ae...-20080619122646-zgt191pytyx46daj
1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o
1388 an...@ae...-20080619134737-wcqb6ptssduanj6y
1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6
1390 an...@ae...-20080619141046-tgdq69hsumw4x55z
+ 1373 an...@ae...-20080614130206-thshu8ln95djpgng
1374 an...@ae...-20080616113201-cexl9qhreccah10e
1375 an...@ae...-20080616113418-7qu4qxldvpxfrdp7
1376 an...@ae...-20080616113559-u5wad4bpwd9uzmd8
1377 an...@ae...-20080616122853-cwqokea7hkf82eo1
1378 an...@ae...-20080616222400-9q0vwtkk6091txce
1380 an...@ae...-20080618110315-ngg1d48fy0h3b6bs
1381 an...@ae...-20080618114001-2574od4etx4v8p9h
1382 an...@ae...-20080618200208-ysmuaq2p7bfh7km4
1383 an...@ae...-20080618200623-29djr6bh81pmu2mu
1384 an...@ae...-20080618201105-neebgl19i1lbskta
1386 an...@ae...-20080619122646-zgt191pytyx46daj
1387 an...@ae...-20080619134508-jiifnq0kk4kskv4o
1388 an...@ae...-20080619134737-wcqb6ptssduanj6y
1389 an...@ae...-20080619134857-7k2kawpsxgqb9ss6
1390 an...@ae...-20080619141046-tgdq69hsumw4x55z
1391 an...@ae...-20080620113224-d5thhgo782mw0rjo
Modified: trunk/FindOpenEXR.cmake
===================================================================
--- trunk/FindOpenEXR.cmake 2008-06-19 14:10:59 UTC (rev 1393)
+++ trunk/FindOpenEXR.cmake 2008-06-20 11:32:55 UTC (rev 1394)
@@ -10,35 +10,46 @@
#
-if ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES )
+if ( OpenEXR_INCLUDE_DIR AND OpenEXR_LIBRARIES )
# in cache already
SET(OpenEXR_FIND_QUIETLY TRUE)
-endif ( OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES )
+endif ( OpenEXR_INCLUDE_DIR AND OpenEXR_LIBRARIES )
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
if( NOT WIN32 )
- INCLUDE(UsePkgConfig)
+ INCLUDE(FindPkgConfig)
- PKGCONFIG(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags)
+ pkg_check_modules(OpenEXR OpenEXR )
+ pkg_check_modules(IlmBase IlmBase)
- SET(OPENEXR_DEFINITIONS ${_OpenEXRCflags})
+ find_library ( OpenEXR_LIBRARIES NAMES IlmImf )
+ find_library ( Iex_LIBRARIES NAMES Iex )
+ find_library ( Half_LIBRARIES NAMES Half )
+ find_library ( Imath_LIBRARIES NAMES Imath )
+ find_library ( IlmThread_LIBRARIES NAMES IlmThread )
+
+ set ( IlmBase_LIBRARIES ${Iex_LIBRARIES} ${Half_LIBRARUES} ${Imath_LIBRARIES} ${IlmThread_LIBRARIES} )
+
+ set ( OpenEXR_INCLUDE_DIR ${OpenEXR_INCLUDE_DIR} ${IlmBase_INCLUDE_DIR} )
+ set ( OpenEXR_LIBRARIES ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} )
+
endif( NOT WIN32 )
-FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h
- PATHS
- ${_OpenEXRIncDir}
- PATH_SUFFIXES OpenEXR
-)
+#FIND_PATH(OPENEXR_INCLUDE_DIR NAMES OpenEXRConfig.h
+# PATHS
+# ${_OpenEXRIncDir}
+# PATH_SUFFIXES OpenEXR
+#)
-FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf
- PATHS
- ${_OpenEXRLinkDir}
-)
+#FIND_LIBRARY(OPENEXR_LIBRARIES NAMES IlmIlf
+# PATHS
+# ${_OpenEXRLinkDir}
+#)
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG OpenEXR_INCLUDE_DIR OpenEXR_LIBRARIES )
# show the OPENEXR_INCLUDE_DIR and OPENEXR_LIBRARIES variables only in the advanced view
-MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES )
+MARK_AS_ADVANCED(OpenEXR_INCLUDE_DIR OpenEXR_LIBRARIES )
Added: trunk/src/openimagelib/plugins/bmp/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/bmp/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/bmp/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_bmp )
+
+set ( SOURCES bmp_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/bmp/" )
+install ( FILES bmp_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/bmp/" )
Added: trunk/src/openimagelib/plugins/dds/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/dds/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/dds/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_dds )
+
+set ( SOURCES dds_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dds/" )
+install ( FILES dds_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dds/" )
Added: trunk/src/openimagelib/plugins/dpx/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/dpx/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/dpx/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_dpx )
+
+set ( SOURCES dpx_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dpx/" )
+install ( FILES dpx_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/dpx/" )
Added: trunk/src/openimagelib/plugins/exr/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/exr/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/exr/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,27 @@
+find_package ( OpenEXR )
+
+if ( OpenEXR_FOUND )
+ set ( NAME openimagelib_exr )
+
+ set ( SOURCES exr_plugin.cpp )
+
+ add_definitions ( ${OpenEXR_DEFINITIONS} )
+
+ include_directories ( ${Boost_INCLUDE_DIR}
+ ${OpenLibraries_SOURCE_DIR}/src
+ ${OpenEXR_INCLUDE_DIRS})
+
+ add_library ( ${NAME} SHARED ${SOURCES} )
+
+ link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+ target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}"
+ ${OpenEXR_LIBRARIES} )
+
+ install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/exr/" )
+ install ( FILES exr_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/exr/" )
+else ( OpenEXR_FOUND )
+ message ( "Can't find libopenexr. Skipping OpenEXR plugin." )
+endif ( OpenEXR_FOUND )
Added: trunk/src/openimagelib/plugins/hdr/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/hdr/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/hdr/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_hdr )
+
+set ( SOURCES hdr_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/hdr/" )
+install ( FILES hdr_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/hdr/" )
Added: trunk/src/openimagelib/plugins/png/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/png/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/png/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,21 @@
+find_package ( PNG )
+
+set ( NAME openimagelib_png )
+
+set ( SOURCES png_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}
+ ${OpenLibraries_SOURCE_DIR}/src
+ ${PNG_INCLUDE_DIR} )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}"
+ ${PNG_LIBRARIES} )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/png/" )
+install ( FILES png_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/png/" )
Added: trunk/src/openimagelib/plugins/psd/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/psd/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/psd/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_psd )
+
+set ( SOURCES psd_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/psd/" )
+install ( FILES psd_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/psd/" )
Added: trunk/src/openimagelib/plugins/sgi/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/sgi/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/sgi/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_sgi )
+
+set ( SOURCES sgi_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/sgi/" )
+install ( FILES sgi_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/sgi/" )
Added: trunk/src/openimagelib/plugins/tga/CMakeLists.txt
===================================================================
--- trunk/src/openimagelib/plugins/tga/CMakeLists.txt (rev 0)
+++ trunk/src/openimagelib/plugins/tga/CMakeLists.txt 2008-06-20 11:32:55 UTC (rev 1394)
@@ -0,0 +1,17 @@
+set ( NAME openimagelib_tga )
+
+set ( SOURCES tga_plugin.cpp )
+
+include_directories ( ${Boost_INCLUDE_DIR}i
+ ${OpenLibraries_SOURCE_DIR}/src )
+
+add_library ( ${NAME} SHARED ${SOURCES} )
+
+link_directories ( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl/
+ ${OpenLibraries_BINARY_DIR}/src/openimagelib/il/ )
+
+target_link_libraries ( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}"
+ "openimagelib_il${LIBRARY_IDENTIFIER}" )
+
+install ( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openimagelib/plugins/tga/" )
+install ( FILES tga_plugin.opl DESTINATION "lib/${PACKAGE}/openimagelib/plugins/tga/" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|