From fcb3515d7f09d14cece441280118dd6601f4382f Mon Sep 17 00:00:00 2001 From: Edgar Velazquez-Armendariz Date: Sat, 17 Aug 2013 23:08:02 -0400 Subject: [PATCH 1/2] Fixup external dependencies provided by Homebrew/MacPorts. --- data/cmake/packaging/MtsFixupBundle.cmake.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/cmake/packaging/MtsFixupBundle.cmake.in b/data/cmake/packaging/MtsFixupBundle.cmake.in index 562db91b..c9cd932f 100644 --- a/data/cmake/packaging/MtsFixupBundle.cmake.in +++ b/data/cmake/packaging/MtsFixupBundle.cmake.in @@ -126,5 +126,8 @@ set (libpaths "@MTS_LIBPATHS@") # Use our custom version of fixup_bundle, which supports @rpath on OS X list(APPEND CMAKE_MODULE_PATH "@CMAKE_MODULE_PATH@") include("MtsBundleUtilities") +if(APPLE) + set(BU_CHMOD_BUNDLE_ITEMS ON) +endif() mts_fixup_bundle("${APP}" "${MTSPLUGINS};${QTPLUGINS};${PYBINDINGS}" "${libpaths}") From e8bc5aeb2ad2a0058ca43b8332ce5fee79c3cf14 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 4 Oct 2013 18:51:19 +0200 Subject: [PATCH 2/2] added heightfield primitive to CMakeLists --- src/shapes/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shapes/CMakeLists.txt b/src/shapes/CMakeLists.txt index 6c73ab39..526ca7fb 100644 --- a/src/shapes/CMakeLists.txt +++ b/src/shapes/CMakeLists.txt @@ -19,6 +19,7 @@ add_shape(cube cube.cpp) add_shape(hair hair.h hair.cpp) add_shape(shapegroup shapegroup.h shapegroup.cpp) add_shape(instance instance.h instance.cpp) +add_shape(heightfield heightfield.cpp) #add_shape(deformable deformable.cpp) add_shape(ply ply.cpp ply/ply_parser.cpp ply/byte_order.hpp ply/config.hpp ply/io_operators.hpp