From 2b9687eeeb6d6f7972e64da622d2bb8df5977021 Mon Sep 17 00:00:00 2001 From: Robert Norris Date: Sat, 30 Apr 2016 20:25:31 +1000 Subject: [PATCH] Makefile: update cmake config for latest assimp --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index eb932f5e..a1220cce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ SED := @SED@ RANLIB := @RANLIB@ INSTALL := @INSTALL@ -CMAKE_ARGS := -DCMAKE_INSTALL_PREFIX=$(USR) +CMAKE_ARGS := -DCMAKE_INSTALL_PREFIX=$(USR) -DBUILD_SHARED_LIBS=OFF ifeq (@MXE_CROSS@,yes) CMAKE_ARGS += -DCMAKE_TOOLCHAIN_FILE=@MXE_CMAKE_TOOLCHAIN_FILE@ endif @@ -26,7 +26,7 @@ clean: $(patsubst %,clean-%,$(PACKAGES)) assimp: cd source/assimp && \ - cmake -D BUILD_ASSIMP_SAMPLES=OFF -D BUILD_ASSIMP_TOOLS=OFF -D ENABLE_BOOST_WORKAROUND=ON $(CMAKE_ARGS) . && \ + cmake -DASSIMP_BUILD_SAMPLES=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF $(CMAKE_ARGS) . && \ $(MAKE) && \ $(MAKE) install