Changeset 3484

Timestamp:

03/09/10 11:03:14 (5 months ago)

Author:

Azaezel

Message:

Partially functional cmake configuration for bullet. at time of writing, It will find the include, and root directories for the various libraries, however, it fails on properly generating a Cmakelists.txt in zbullet

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2

Files:

• CMakeLists.txt (modified) (1 diff)
• ZBullet/CMakeLists.template (modified) (3 diffs)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/CMakeLists.txt

@@ -155 +155 @@
 endif(OPENDE_FOUND)
 
+#-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
+# ZBULLET but only if BULLET is found
+Find_Package(BULLET)
+
+if (BULLET_FOUND)
+    message("-- ZBULLET (${BULLET_FOUND}, ${BULLET_LIBRARIES})")
+    add_subdirectory(ZBULLET)
+else(BULLET_FOUND)
+    message("-- ZBULLET will NOT be compiled.  BULLET was not found.")
+endif(BULLET_FOUND)
+
+
+#-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
 message("-- ZMicroPather")
 add_subdirectory(ZMicroPather)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/CMakeLists.template

@@ -16 +16 @@
 
 #-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
-# Include ZBullet source file
+# Include ZODE source file
 
 <%GroupList%>
         
-set ( ZBullet_SRC
+set ( ZBULLET_SRC
 <%SourceList%>
     )
@@ -30 +30 @@
 link_directories ( ${DEV_LIB} ${Boost_LIBRARY_DIRS} )
 
-add_library ( ZBullet ${LIB_TYPE} ${ZBullet_SRC} )
+add_library ( ZBULLET ${LIB_TYPE} ${ZBULLET_SRC} )
 
-add_dependencies( ZBullet ZenCore ZenEngine )
+add_dependencies( ZBULLET ZenCore ZenEngine )
 
-target_link_libraries( ZBullet ZenCore ZenEngine ${ZBULLET_LIBRARIES} )
+target_link_libraries( ZBULLET ZenCore ZenEngine ${BULLET_LIBRARIES} )
 
-set_target_properties ( ZBullet 
+set_target_properties ( ZBULLET
                                                 PROPERTIES
                                                 DEBUG_POSTFIX "_d"
@@ -43 +43 @@
 if (MSVC_IDE)
     # hack to get around the "Debug" and "Release" directories cmake tries to add on Windows
-    set_target_properties ( ZBullet PROPERTIES PREFIX "../../bin/" )
-        set_target_properties ( ZBullet PROPERTIES IMPORT_PREFIX "../../lib/" )
+    set_target_properties ( ZODE PROPERTIES PREFIX "../../bin/" )
+        set_target_properties ( ZODE PROPERTIES IMPORT_PREFIX "../../lib/" )
 endif(MSVC_IDE)