[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40085] trunk/blender: fixed linking with CMake

[Campbell Barton]

Revision: 40085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40085
Author:   campbellbarton
Date:     2011-09-10 03:42:45 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
fixed linking with CMake

Modified Paths:
--------------
    trunk/blender/extern/CMakeLists.txt
    trunk/blender/extern/recastnavigation/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt
    trunk/blender/source/gameengine/Ketsji/CMakeLists.txt

Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt	2011-09-10 03:07:26 UTC (rev 40084)
+++ trunk/blender/extern/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
@@ -42,8 +42,12 @@
 if(WITH_BUILTIN_GLEW)
 	add_subdirectory(glew)
 endif()
-add_subdirectory(recastnavigation)
 
+## TODO MAKE GAME ENGINE ONLY
+# if(WITH_GAMEENGINE)
+   add_subdirectory(recastnavigation)
+# endif()
+
 if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
 	add_subdirectory(libopenjpeg)
 endif()

Modified: trunk/blender/extern/recastnavigation/CMakeLists.txt
===================================================================
--- trunk/blender/extern/recastnavigation/CMakeLists.txt	2011-09-10 03:07:26 UTC (rev 40084)
+++ trunk/blender/extern/recastnavigation/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
@@ -63,4 +63,4 @@
 		Recast/Include/RecastTimer.h	
 )
 
-blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
\ No newline at end of file
+blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-09-10 03:07:26 UTC (rev 40084)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
@@ -819,6 +819,8 @@
 		bf_blenfont
 		bf_intern_audaspace
 		bf_intern_mikktspace
+		extern_recastnavigation
+		bf_editor_util          # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release!
 	)
 
 	if(WITH_MOD_CLOTH_ELTOPO)

Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt	2011-09-10 03:07:26 UTC (rev 40084)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt	2011-09-10 03:42:45 UTC (rev 40085)
@@ -59,7 +59,7 @@
 	${GLEW_INCLUDE_PATH}
 	../../../extern/recastnavigation/Recast/Include
 	../../../extern/recastnavigation/Detour/Include
-	../../../source/blender/editors/include
+	../../blender/editors/include
 )
 
 set(SRC