diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 21:53:49 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 21:53:49 +0400 |
| commit | 8cfc17c7cdef0ea6fc3bfc196e317e2cb3add4b0 (patch) | |
| tree | eda7f6736c3bfed007f1d7d3124375034cbbacc9 /CMakeLists.txt | |
| parent | fb925d9ad330b1562cb201f26e19eca0e77df248 (diff) | |
Cycles Merge:
* It seems we have a problem compiling the CUDA kernel at runtime on Windows,
will need to investigate more how to solve this best, CPU render should go
fine though.
* Change OPENIMAGEIO to OPENIMAGEIO_ROOT_DIR on linux for consistency.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 13c41330f5a..3f6d867d707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -519,7 +519,6 @@ if(UNIX AND NOT APPLE) if(WITH_OPENIMAGEIO) set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory") - set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO}) find_package(OpenImageIO) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES}) |