diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-20 16:17:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-20 16:17:45 +0400 |
| commit | 3abef3a2e6b77949f2e992baefd660422e3e19fe (patch) | |
| tree | 4559b84faedd744d6a64508b0c75fecd82121404 /intern/cycles | |
| parent | 1820d3529c7fe37d4a03aca975881c4fc4304f38 (diff) | |
Cycles OSL: some build system tweaks to avoid global includes and definitions,
which ensures there is no conflict with other libraries, and avoids full rebuild
when toggling OSL on/off.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/nodes/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 38daf790955..7562ee0a0a5 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -41,6 +41,7 @@ endif() if(WITH_CYCLES_OSL) add_definitions(-DWITH_OSL) + include_directories(${OSL_INCLUDES}) endif() if(WITH_CYCLES_PARTIO) diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt index 65b8504ce43..faf7941ee5e 100644 --- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt +++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt @@ -88,7 +88,7 @@ foreach(_file ${SRC_OSL}) unset(_OSO_FILE) endforeach() -add_custom_target(shader ALL DEPENDS ${SRC_OSO} ${SRC_OSL_HEADERS}) +add_custom_target(cycles_osl_shaders ALL DEPENDS ${SRC_OSO} ${SRC_OSL_HEADERS}) # CMAKE_CURRENT_SOURCE_DIR is already included in OSO paths delayed_install("" "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader) |