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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-06-30 18:47:57 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-06-30 18:47:57 +0400
commit4ff22bd097e979e07622793d1f44d7419fb73efd (patch)
tree8eae37d4244146d2ce9e9d82567a358176cfda77 /intern/cycles/CMakeLists.txt
parentb57c87856d6d27f9829d47f0895ab4f86b1c865f (diff)
Cycles: OS X build system changes to use lib/ openimageio and boost.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
-rw-r--r--intern/cycles/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 38be2f62ec4..8f8b431ada5 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -22,9 +22,12 @@ SET(CYCLES_CUDA_MAXREG 24 CACHE STRING "CUDA maximum number of register to use")
# Paths
+IF(UNIX AND NOT APPLE)
+ SET(CYCLES_OIIO "" CACHE PATH "Path to OpenImageIO installation")
+ SET(CYCLES_BOOST "/usr" CACHE PATH "Path to Boost installation")
+ENDIF()
+
SET(CYCLES_OSL "" CACHE PATH "Path to OpenShadingLanguage installation")
-SET(CYCLES_OIIO "" CACHE PATH "Path to OpenImageIO installation")
-SET(CYCLES_BOOST "/usr" CACHE PATH "Path to Boost installation")
SET(CYCLES_CUDA "/usr/local/cuda" CACHE PATH "Path to CUDA installation")
SET(CYCLES_OPENCL "" CACHE PATH "Path to OpenCL installation")
SET(CYCLES_PARTIO "" CACHE PATH "Path to Partio installation")