[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37907] branches/cycles/intern/cycles/ cmake/external_libs.cmake: Cycles: attempt to fix OIIO include path on windows.

[Brecht Van Lommel]

Revision: 37907
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37907
Author:   blendix
Date:     2011-06-28 15:23:30 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Cycles: attempt to fix OIIO include path on windows.

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 15:09:09 UTC (rev 37906)
+++ branches/cycles/intern/cycles/cmake/external_libs.cmake	2011-06-28 15:23:30 UTC (rev 37907)
@@ -36,7 +36,7 @@
 # OpenImageIO
 
 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_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h PATHS ${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)
@@ -76,7 +76,7 @@
 	MESSAGE(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
 
 	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_PATH(OSL_INCLUDES OSL/oslclosure.h PATHS ${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)