diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-07 03:32:21 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-07 03:32:21 +0400 |
| commit | 1fe70c07a008185c4e5925aff2c214c93ff396b7 (patch) | |
| tree | 5dd9fc4a6be56243977b2670c8acfe4eb5543d96 /extern | |
| parent | cdc1e5a716c08e809b771388c6b5075d32a20c98 (diff) | |
| parent | e7db06ad9db5a1a05b00fc835038d4366d637851 (diff) | |
Merged changes in the trunk up to revision 51126.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_types.h
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/carve/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/carve/CMakeLists.txt b/extern/carve/CMakeLists.txt index 3916047ff32..5e917ac1e44 100644 --- a/extern/carve/CMakeLists.txt +++ b/extern/carve/CMakeLists.txt @@ -158,7 +158,7 @@ if(WITH_BOOST) -DCARVE_SYSTEM_BOOST ) - list(APPEND INC + list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} ) endif() |