diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:01:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:08 +0300 |
| commit | e9596e5deff93364a0fe588f8e8e408fcbcc2b96 (patch) | |
| tree | 25d2a149aa9c6b77679e81337086a34a616a50b8 /intern/cycles/CMakeLists.txt | |
| parent | b8fc4fe5aa542064c44db3476c8d8911bf674f01 (diff) | |
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.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 4facb8d4ff9..2ba6af48d0d 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -179,10 +179,11 @@ include_directories( ${PUGIXML_INCLUDE_DIR} ) -# TODO(sergey): Adjust so standalone repository is also happy. -include_directories( - ../atomic -) +if(CYCLES_STANDALONE_REPOSITORY) + include_directories(../third_party/atomic) +else() + include_directories(../atomic) +endif() # Warnings if(CMAKE_COMPILER_IS_GNUCXX) |