diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 21:37:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 21:37:10 +0300 |
| commit | 05dc109553f447a8ba0d1db7daf2f2c39fcb6d38 (patch) | |
| tree | 00527697bed436d0be5de5c26bd233191a8914b9 /intern | |
| parent | 195879a50d6b058d78ff6228d8eda159c7abead3 (diff) | |
| parent | 86e20a2e63ea7c4810782942d5a3505f21718068 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/dualcon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/mikktspace/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/rigidbody/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index ae4977aaed0..77c72777aa6 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -39,7 +39,7 @@ set(SRC set(ADDON_FILES addon/__init__.py - addon/engine.py + addon/engine.py addon/osl.py addon/presets.py addon/properties.py diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index b28d017c1c2..40720bc3682 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -110,7 +110,7 @@ foreach(_file ${SRC_OSL}) string(REPLACE ".osl" ".oso" _OSO_FILE ${_OSL_FILE}) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE}) add_custom_command( - OUTPUT ${_OSO_FILE} + OUTPUT ${_OSO_FILE} COMMAND ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER}) list(APPEND SRC_OSO diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt index 40c8ef8ff9c..213379e852e 100644 --- a/intern/dualcon/CMakeLists.txt +++ b/intern/dualcon/CMakeLists.txt @@ -30,7 +30,7 @@ set(SRC intern/marching_cubes_table.cpp intern/octree.cpp intern/Projections.cpp - + intern/cubes.h intern/GeoCommon.h intern/manifold_table.h diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt index 8abd9559358..299ec7fe501 100644 --- a/intern/mikktspace/CMakeLists.txt +++ b/intern/mikktspace/CMakeLists.txt @@ -35,7 +35,7 @@ set(INC ) set(INC_SYS - + ) set(SRC diff --git a/intern/rigidbody/CMakeLists.txt b/intern/rigidbody/CMakeLists.txt index 5d84c2cf082..91fe1023b5e 100644 --- a/intern/rigidbody/CMakeLists.txt +++ b/intern/rigidbody/CMakeLists.txt @@ -31,7 +31,7 @@ set(INC_SYS set(SRC rb_bullet_api.cpp - + RBI_api.h ) |