diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-03 19:07:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-03 19:07:49 +0400 |
| commit | 66a2b848972d47a033f617a40f9a9044756d1d32 (patch) | |
| tree | bf30f5bc13e9c0b4f52aacead676a2c07cbb331a /build_files | |
| parent | 0c5dfc8a639b04e1767852121b9dee7cd5bb050f (diff) | |
| parent | 4774357b594c5cd5a38b21df131b539a197c101b (diff) | |
Merged changes in the trunk up to revision 54992.
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 5 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 5175eb9a4f6..490c976655d 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -796,6 +796,11 @@ compile_OIIO() { cmake_d="$cmake_d -D CMAKE_PREFIX_PATH=$_inst" cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst" cmake_d="$cmake_d -D BUILDSTATIC=ON" + + # Optional tests and cmd tools + cmake_d="$cmake_d -D USE_QT=OFF" + cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF" + cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF" # linking statically could give issues on Debian/Ubuntu (and probably other distros # which doesn't like static linking) when linking shared oiio library due to missing diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index bdd82a4f438..56ac48bfa61 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -143,7 +143,9 @@ macro(blender_source_group foreach(_SRC ${sources}) get_filename_component(_SRC_EXT ${_SRC} EXT) - if((${_SRC_EXT} MATCHES ".h") OR (${_SRC_EXT} MATCHES ".hpp")) + if((${_SRC_EXT} MATCHES ".h") OR + (${_SRC_EXT} MATCHES ".hpp") OR + (${_SRC_EXT} MATCHES ".hh")) source_group("Header Files" FILES ${_SRC}) else() source_group("Source Files" FILES ${_SRC}) @@ -499,6 +501,7 @@ macro(remove_strict_flags) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") remove_cc_flag("-Wunused-parameter") remove_cc_flag("-Wunused-variable") + remove_cc_flag("-Werror=[^ ]+") remove_cc_flag("-Werror") endif() |