From 1352a955ca61b20d071d064d88f981711f80dd1d Mon Sep 17 00:00:00 2001
From: Lukas Toenne <lukas.toenne@googlemail.com>
Date: Mon, 10 Sep 2012 06:18:20 +0000
Subject: Cleanup for OSL linking in cmake: Move cmake OSL library search and
 path definition from the cycles macro file to the top-level CMakeLists.txt.
 This makes the OSL_LIBRARIES and other variables accessible throughout
 Blender cmake scripts and especially in the creator module for linking
 libraries.

---
 intern/cycles/cmake/external_libs.cmake | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'intern/cycles/cmake')

diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 4f547a5b644..332d3d74715 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -17,32 +17,6 @@ else()
 	set(CYCLES_GLEW_LIBRARY extern_glew)
 endif()
 
-###########################################################################
-# OpenShadingLanguage
-
-if(WITH_CYCLES_OSL)
-
-	set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
-
-	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 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)
-		set(OSL_FOUND TRUE)
-		message(STATUS "OSL includes = ${OSL_INCLUDES}")
-		message(STATUS "OSL library = ${OSL_LIBRARIES}")
-		message(STATUS "OSL compiler = ${OSL_COMPILER}")
-	else()
-		message(STATUS "OSL not found")
-	endif()
-
-	include_directories(${OSL_INCLUDES} ${OSL_INCLUDES}/OSL ${OSL_INCLUDES}/../../../src/liboslexec)
-
-endif()
-
 ###########################################################################
 # Partio
 
-- 
cgit v1.2.3