Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Toenne <lukas.toenne@googlemail.com>2012-09-10 10:18:20 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2012-09-10 10:18:20 +0400
commit1352a955ca61b20d071d064d88f981711f80dd1d (patch)
tree1ef07c261158eb4cf9064ff6d6bf19a7b5115305 /intern/cycles/kernel/osl/CMakeLists.txt
parent12c71a8c6866e345373127e976f55cb15aa73ded (diff)
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.
Diffstat (limited to 'intern/cycles/kernel/osl/CMakeLists.txt')
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index ea675456e6d..d4ea8b12f5a 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -43,7 +43,3 @@ include_directories(${INC})
add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
add_subdirectory(nodes)
-
-if(WITH_CYCLES_OSL)
- target_link_libraries(cycles_kernel_osl ${OSL_LIBRARIES})
-endif()