Blender Git Commit Log

Git Commits -> Revision e9596e5

Revision e9596e5 by Sergey Sharybin (master)
December 31, 2014, 20:31 (GMT)
Cycles: Post-reintegration tweaks to ensure things do compile

This commit contains all the tweaks which were missing in initial patch
re-integration from the standalone Cycles repository.

This commit also contains an utility cmake macro to help linking targets
with different libraries for release/debug builds, the name currently is

target_link_libraries_decoupled

it gets a target and list of libraries and makes sure debug builds are
using libraries with "_d" suffix.

After all this changes it'll hopefully be easier to interchange patches
between blender and standalone repositories, because they're now quite
identical.

Commit Details:

Full Hash: e9596e5deff93364a0fe588f8e8e408fcbcc2b96
Parent Commit: b8fc4fe
Lines Changed: +34, -8

8 Modified Paths:

/build_files/cmake/macros.cmake (+13, -0) (Diff)
/intern/cycles/app/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/cmake/external_libs.cmake (+2, -1) (Diff)
/intern/cycles/CMakeLists.txt (+5, -4) (Diff)
/intern/cycles/kernel/osl/SConscript (+1, -1) (Diff)
/intern/cycles/SConscript (+1, -1) (Diff)
/intern/cycles/util/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/util/util_opengl.h (+7, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021