From fad1c3fb58f9a6ee4814d005b0be182b71546c22 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Tue, 25 Aug 2009 19:50:33 +0000 Subject: BMesh/CMake: * Updated/added cmake configuration for building bmesh --- source/blender/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/CMakeLists.txt') diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index a9e3d50211f..4696901ca45 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -40,6 +40,7 @@ ADD_SUBDIRECTORY(makesrna) ADD_SUBDIRECTORY(readblenfile) ADD_SUBDIRECTORY(render) ADD_SUBDIRECTORY(blenfont) +ADD_SUBDIRECTORY(bmesh) IF(WITH_OPENEXR) ADD_SUBDIRECTORY(imbuf/intern/openexr) -- cgit v1.2.3 From deebf4f8f0d79169a0e6c2a391670419b6492bfe Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Wed, 16 Sep 2009 17:43:09 +0000 Subject: merge with 2.5/trunk at r23271 --- source/blender/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/CMakeLists.txt') diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 4696901ca45..f1e58f828b4 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -43,18 +43,18 @@ ADD_SUBDIRECTORY(blenfont) ADD_SUBDIRECTORY(bmesh) IF(WITH_OPENEXR) - ADD_SUBDIRECTORY(imbuf/intern/openexr) + ADD_SUBDIRECTORY(imbuf/intern/openexr) ENDIF(WITH_OPENEXR) IF(WITH_DDS) - ADD_SUBDIRECTORY(imbuf/intern/dds) + ADD_SUBDIRECTORY(imbuf/intern/dds) ENDIF(WITH_DDS) IF(WITH_QUICKTIME) - ADD_SUBDIRECTORY(quicktime) + ADD_SUBDIRECTORY(quicktime) ENDIF(WITH_QUICKTIME) IF(WITH_PYTHON) - ADD_SUBDIRECTORY(python) + ADD_SUBDIRECTORY(python) ENDIF(WITH_PYTHON) -- cgit v1.2.3 From 8f788c64db587e74079d812dbcea40c2bd4b91ff Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Thu, 22 Oct 2009 23:22:05 +0000 Subject: merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]] --- source/blender/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/CMakeLists.txt') diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index f1e58f828b4..025ffc49ab1 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -41,6 +41,7 @@ ADD_SUBDIRECTORY(readblenfile) ADD_SUBDIRECTORY(render) ADD_SUBDIRECTORY(blenfont) ADD_SUBDIRECTORY(bmesh) +ADD_SUBDIRECTORY(ikplugin) IF(WITH_OPENEXR) ADD_SUBDIRECTORY(imbuf/intern/openexr) -- cgit v1.2.3 From a37bcf93ef395817a881918053ffff9c2ab73a03 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Wed, 14 Jul 2010 22:06:10 +0000 Subject: wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later). --- source/blender/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/CMakeLists.txt') diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index b0c88a48536..b7686752882 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -30,6 +30,7 @@ ADD_SUBDIRECTORY(avi) ADD_SUBDIRECTORY(nodes) ADD_SUBDIRECTORY(blenkernel) ADD_SUBDIRECTORY(blenlib) +ADD_SUBDIRECTORY(bmesh) ADD_SUBDIRECTORY(blenloader) ADD_SUBDIRECTORY(blenpluginapi) ADD_SUBDIRECTORY(imbuf) @@ -40,7 +41,6 @@ ADD_SUBDIRECTORY(makesrna) ADD_SUBDIRECTORY(readblenfile) ADD_SUBDIRECTORY(render) ADD_SUBDIRECTORY(blenfont) -ADD_SUBDIRECTORY(bmesh) ADD_SUBDIRECTORY(ikplugin) IF(WITH_OPENEXR) -- cgit v1.2.3