Revision: 44829
http://brlcad.svn.sourceforge.net/brlcad/?rev=44829&view=rev
Author: kunigami
Date: 2011-06-08 21:25:59 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
added three more cmake finders. Also edited Makefile.am this time
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindOSL.cmake
Added Paths:
-----------
brlcad/trunk/misc/CMake/FindOIIO.cmake
brlcad/trunk/misc/CMake/FindOpenEXR.cmake
brlcad/trunk/misc/CMake/FindTBB.cmake
Added: brlcad/trunk/misc/CMake/FindOIIO.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindOIIO.cmake (rev 0)
+++ brlcad/trunk/misc/CMake/FindOIIO.cmake 2011-06-08 21:25:59 UTC (rev
44829)
@@ -0,0 +1,36 @@
+###########################################################################
+# OpenImageIO
+
+
+# If 'OPENIMAGEHOME' not set, use the env variable of that name if available
+if (NOT OPENIMAGEIOHOME)
+ if (NOT $ENV{OPENIMAGEIOHOME} STREQUAL "")
+ set (OPENIMAGEIOHOME $ENV{OPENIMAGEIOHOME})
+ endif ()
+endif ()
+
+
+MESSAGE ( STATUS "OPENIMAGEIOHOME = ${OPENIMAGEIOHOME}" )
+
+find_library ( OPENIMAGEIO_LIBRARY
+ NAMES OpenImageIO
+ PATHS ${OPENIMAGEIOHOME}/lib )
+find_path ( OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h
+ ${OPENIMAGEIOHOME}/include )
+IF (OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY )
+ SET ( OPENIMAGEIO_FOUND TRUE )
+ MESSAGE ( STATUS "OpenImageIO includes = ${OPENIMAGEIO_INCLUDES}" )
+ MESSAGE ( STATUS "OpenImageIO library = ${OPENIMAGEIO_LIBRARY}" )
+ MESSAGE ( STATUS "OpenImageIO namespace = ${OPENIMAGEIO_NAMESPACE}" )
+ if (OPENIMAGEIO_NAMESPACE)
+ add_definitions ("-DOPENIMAGEIO_NAMESPACE=${OPENIMAGEIO_NAMESPACE}")
+ endif ()
+# N.B. -- once we're confident that we only build against OIIO >= 0.9.x,
+# specifically versions after we did the big namespace change, then we
+# can completely eliminate the 'OPENIMAGEIO_NAMESPACE' parts above.
+ELSE ()
+ MESSAGE ( STATUS "OpenImageIO not found" )
+ENDIF ()
+
+# end OpenImageIO setup
+###########################################################################
Property changes on: brlcad/trunk/misc/CMake/FindOIIO.cmake
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/trunk/misc/CMake/FindOSL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindOSL.cmake 2011-06-08 21:03:09 UTC (rev
44828)
+++ brlcad/trunk/misc/CMake/FindOSL.cmake 2011-06-08 21:25:59 UTC (rev
44829)
@@ -2,7 +2,6 @@
# Find OSL Dependences
# ================================================
include(util_macros)
-include(boost)
include(FindOpenEXR)
include(FindTBB)
include(FindOIIO)
Added: brlcad/trunk/misc/CMake/FindOpenEXR.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindOpenEXR.cmake (rev 0)
+++ brlcad/trunk/misc/CMake/FindOpenEXR.cmake 2011-06-08 21:25:59 UTC (rev
44829)
@@ -0,0 +1,96 @@
+###########################################################################
+# IlmBase and OpenEXR setup
+
+# TODO: Place the OpenEXR stuff into a separate FindOpenEXR.cmake module.
+
+# example of using setup_var instead:
+#setup_var (ILMBASE_VERSION 1.0.1 "Version of the ILMBase library")
+setup_string (ILMBASE_VERSION 1.0.1
+ "Version of the ILMBase library")
+mark_as_advanced (ILMBASE_VERSION)
+setup_path (ILMBASE_HOME "${THIRD_PARTY_TOOLS_HOME}"
+ "Location of the ILMBase library install")
+mark_as_advanced (ILMBASE_HOME)
+find_path (ILMBASE_INCLUDE_AREA OpenEXR/half.h
+ ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION}
+ ${ILMBASE_HOME}/include
+ )
+if (ILMBASE_CUSTOM)
+ set (IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
+ separate_arguments(IlmBase_Libraries)
+else ()
+ set (IlmBase_Libraries Imath Half IlmThread Iex)
+endif ()
+
+foreach (_lib ${IlmBase_Libraries})
+ find_library (current_lib ${_lib}
+ PATHS ${ILMBASE_HOME}/lib ${ILMBASE_HOME}/lib64
+ ${ILMBASE_LIB_AREA}
+ )
+ list(APPEND ILMBASE_LIBRARIES ${current_lib})
+ # this effectively unsets ${current_lib} so that find_library()
+ # won't use the previous search results from the cache
+ set (current_lib current_lib-NOTFOUND)
+endforeach ()
+
+message (STATUS "ILMBASE_INCLUDE_AREA = ${ILMBASE_INCLUDE_AREA}")
+message (STATUS "ILMBASE_LIBRARIES = ${ILMBASE_LIBRARIES}")
+
+if (ILMBASE_INCLUDE_AREA AND ILMBASE_LIBRARIES)
+ set (ILMBASE_FOUND true)
+ include_directories ("${ILMBASE_INCLUDE_AREA}")
+ include_directories ("${ILMBASE_INCLUDE_AREA}/OpenEXR")
+else ()
+ message (FATAL_ERROR "ILMBASE not found!")
+endif ()
+
+macro (LINK_ILMBASE target)
+ target_link_libraries (${target} ${ILMBASE_LIBRARIES})
+endmacro ()
+
+setup_string (OPENEXR_VERSION 1.6.1 "OpenEXR version number")
+setup_string (OPENEXR_VERSION_DIGITS 010601 "OpenEXR version preprocessor
number")
+mark_as_advanced (OPENEXR_VERSION)
+mark_as_advanced (OPENEXR_VERSION_DIGITS)
+# FIXME -- should instead do the search & replace automatically, like this
+# way it was done in the old makefiles:
+# OPENEXR_VERSION_DIGITS ?= 0$(subst .,0,${OPENEXR_VERSION})
+setup_path (OPENEXR_HOME "${THIRD_PARTY_TOOLS_HOME}"
+ "Location of the OpenEXR library install")
+mark_as_advanced (OPENEXR_HOME)
+
+find_path (OPENEXR_INCLUDE_AREA OpenEXR/OpenEXRConfig.h
+ ${OPENEXR_HOME}/include
+ ${ILMBASE_HOME}/include/openexr-${OPENEXR_VERSION}
+ )
+if (OPENEXR_CUSTOM)
+ find_library (OPENEXR_LIBRARY ${OPENEXR_CUSTOM_LIBRARY}
+ PATHS ${OPENEXR_HOME}/lib
+ ${OPENEXR_HOME}/lib64
+ ${OPENEXR_LIB_AREA}
+ )
+else ()
+ find_library (OPENEXR_LIBRARY IlmImf
+ PATHS ${OPENEXR_HOME}/lib
+ ${OPENEXR_HOME}/lib64
+ ${OPENEXR_LIB_AREA}
+ )
+endif ()
+
+message (STATUS "OPENEXR_INCLUDE_AREA = ${OPENEXR_INCLUDE_AREA}")
+message (STATUS "OPENEXR_LIBRARY = ${OPENEXR_LIBRARY}")
+if (OPENEXR_INCLUDE_AREA AND OPENEXR_LIBRARY)
+ set (OPENEXR_FOUND true)
+ include_directories (${OPENEXR_INCLUDE_AREA})
+ include_directories (${OPENEXR_INCLUDE_AREA}/OpenEXR)
+else ()
+ message (STATUS "OPENEXR not found!")
+endif ()
+add_definitions ("-DOPENEXR_VERSION=${OPENEXR_VERSION_DIGITS}")
+find_package (ZLIB)
+macro (LINK_OPENEXR target)
+ target_link_libraries (${target} ${OPENEXR_LIBRARY} ${ZLIB_LIBRARIES})
+endmacro ()
+
+
+# end IlmBase and OpenEXR setup
Property changes on: brlcad/trunk/misc/CMake/FindOpenEXR.cmake
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/misc/CMake/FindTBB.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindTBB.cmake (rev 0)
+++ brlcad/trunk/misc/CMake/FindTBB.cmake 2011-06-08 21:25:59 UTC (rev
44829)
@@ -0,0 +1,44 @@
+###########################################################################
+# TBB (Intel Thread Building Blocks) setup
+
+setup_path (TBB_HOME "${THIRD_PARTY_TOOLS_HOME}"
+ "Location of the TBB library install")
+mark_as_advanced (TBB_HOME)
+if (USE_TBB)
+ set (TBB_VERSION 22_004oss)
+ if (MSVC)
+ find_library (TBB_LIBRARY
+ NAMES tbb
+ PATHS ${TBB_HOME}/lib
+ PATHS ${THIRD_PARTY_TOOLS_HOME}/lib/
+ ${TBB_HOME}/tbb-${TBB_VERSION}/lib/
+ )
+ find_library (TBB_DEBUG_LIBRARY
+ NAMES tbb_debug
+ PATHS ${TBB_HOME}/lib
+ PATHS ${THIRD_PARTY_TOOLS_HOME}/lib/
+ ${TBB_HOME}/tbb-${TBB_VERSION}/lib/)
+ endif (MSVC)
+ find_path (TBB_INCLUDES tbb/tbb_stddef.h
+ ${TBB_HOME}/include/tbb${TBB_VERSION}
+ ${THIRD_PARTY_TOOLS}/include/tbb${TBB_VERSION}
+ ${PROJECT_SOURCE_DIR}/include
+ ${OPENIMAGEIOHOME}/include/OpenImageIO
+ )
+ if (TBB_INCLUDES OR TBB_LIBRARY)
+ set (TBB_FOUND TRUE)
+ message (STATUS "TBB includes = ${TBB_INCLUDES}")
+ message (STATUS "TBB library = ${TBB_LIBRARY}")
+ add_definitions ("-DUSE_TBB=1")
+ else ()
+ message (STATUS "TBB not found")
+ endif ()
+else ()
+ add_definitions ("-DUSE_TBB=0")
+ message (STATUS "TBB will not be used")
+ set(TBB_INCLUDES "")
+ set(TBB_LIBRARY "")
+endif ()
+
+# end TBB setup
+###########################################################################
Property changes on: brlcad/trunk/misc/CMake/FindTBB.cmake
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
