From 3a5f2272adc4ec821db16de95781b9ce653dda73 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 11 Sep 2011 00:08:07 +0000 Subject: cmake edits to navmesh so includes are not added unless the game engines enabled. --- source/blender/editors/object/CMakeLists.txt | 5 ++++- source/blender/editors/util/CMakeLists.txt | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 58ebb12e345..b9b8ddc6305 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -33,7 +33,6 @@ set(INC ../../render/extern/include ../../windowmanager ../../../../intern/guardedalloc - ../../../../extern/recastnavigation/Recast/Include ) set(INC_SYS @@ -60,6 +59,10 @@ set(SRC ) if(WITH_GAMEENGINE) + list(APPEND INC + ../../../../extern/recastnavigation/Recast/Include + ) + list(APPEND SRC object_navmesh.cpp ) diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 5e05342f3dc..c64b16c2d08 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -24,7 +24,6 @@ set(INC ../../blenkernel ../../blenlib ../../blenloader - ../../../../extern/recastnavigation/Recast/Include ../../makesdna ../../makesrna ../../windowmanager @@ -63,7 +62,6 @@ set(SRC ../include/ED_markers.h ../include/ED_mball.h ../include/ED_mesh.h - ../include/ED_navmesh_conversion.h ../include/ED_node.h ../include/ED_numinput.h ../include/ED_object.h @@ -90,8 +88,14 @@ set(SRC ) if(WITH_GAMEENGINE) + list(APPEND INC + ../../../../extern/recastnavigation/Recast/Include + ) + list(APPEND SRC navmesh_conversion.cpp + + ../include/ED_navmesh_conversion.h ) endif() -- cgit v1.2.3