[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37903] branches/cycles/intern/cycles/ cmake/external_libs.cmake: Cycles: cmake tweak to make specifying OSL/ OIIO path simpler.

[Brecht Van Lommel]

Revision: 37903
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37903
Author:   blendix
Date:     2011-06-28 14:37:08 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Cycles: cmake tweak to make specifying OSL/OIIO path simpler.

Modified Paths:
--------------
    branches/cycles/intern/cycles/cmake/external_libs.cmake

Modified: branches/cycles/intern/cycles/cmake/external_libs.cmake
===================================================================
--- branches/cycles/intern/cycles/cmake/external_libs.cmake	2011-06-28 14:25:52 UTC (rev 37902)
+++ branches/cycles/intern/cycles/cmake/external_libs.cmake	2011-06-28 14:37:08 UTC (rev 37903)
@@ -35,9 +35,9 @@
 ###########################################################################
 # OpenImageIO
 
-FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib)
-FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include)
-FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin)
+FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib ${CYCLES_OIIO}/dist)
+FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include ${CYCLES_OIIO}/dist)
+FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin ${CYCLES_OIIO}/dist)
 
 IF(OPENIMAGEIO_INCLUDES AND OPENIMAGEIO_LIBRARY)
 	SET(OPENIMAGEIO_FOUND TRUE)
@@ -75,9 +75,9 @@
 
 	MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
 
-	FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib)
-	FIND_PATH(OSL_INCLUDES OSL/oslclosure.h ${CYCLES_OSL}/include)
-	FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+	FIND_LIBRARY(OSL_LIBRARIES NAMES oslexec oslcomp oslquery PATHS ${CYCLES_OSL}/lib ${CYCLES_OSL}/dist)
+	FIND_PATH(OSL_INCLUDES OSL/oslclosure.h ${CYCLES_OSL}/include ${CYCLES_OSL}/dist)
+	FIND_PROGRAM(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin ${CYCLES_OSL}/dist)
 
 	IF(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
 		SET(OSL_FOUND TRUE)