Просмотр исходного кода

Improved notion of Bullet 'found': don't assume absent debug libraries mean absent Bullet, and if Bullet is *really* absent, then don't try to build the binaries.

mcc 13 лет назад
Родитель
Сommit
9d619f2d49
2 измененных файлов с 11 добавлено и 4 удалено
  1. 2 2
      CMake/FindBullet.cmake
  2. 9 2
      Modules/Bindings/CMakeLists.txt

+ 2 - 2
CMake/FindBullet.cmake

@@ -249,9 +249,9 @@ SET(BULLET_LIBRARIES ${LIBBULLETMULTITHREADED} ${LIBBULLETSOFTBODY} ${LIBBULLETD
 
 SET(BULLET_LIBRARIES_DEBUG ${LIBBULLETMULTITHREADED_DEBUG} ${LIBBULLETSOFTBODY_DEBUG} ${LIBBULLETDYNAMICS_DEBUG} ${LIBBULLETCOLLISION_DEBUG} ${LIBBULLETMATH_DEBUG})
 
-IF(BULLET_INCLUDE_DIR AND BULLET_LIBRARIES AND BULLET_LIBRARIES_DEBUG)
+IF(BULLET_INCLUDE_DIR AND BULLET_LIBRARIES)
   SET(BULLET_FOUND TRUE)
-ENDIF(BULLET_INCLUDE_DIR AND BULLET_LIBRARIES AND BULLET_LIBRARIES_DEBUG)
+ENDIF(BULLET_INCLUDE_DIR AND BULLET_LIBRARIES)
 
 # show the BULLET_INCLUDE_DIR and BULLET_LIBRARIES variables only in the advanced view
 IF(BULLET_FOUND)

+ 9 - 2
Modules/Bindings/CMakeLists.txt

@@ -1,3 +1,10 @@
 ADD_SUBDIRECTORY(2DPhysics)
-ADD_SUBDIRECTORY(3DPhysics)
-ADD_SUBDIRECTORY(UI)
+
+# Note that FindBullet requires CMake >= 2.8.4 to find Bullet >= 2.77 
+# due to Bullet's header install directory location changing.
+FIND_PACKAGE(Bullet)
+IF(BULLET_FOUND)
+    ADD_SUBDIRECTORY(3DPhysics)
+ENDIF(BULLET_FOUND)
+
+ADD_SUBDIRECTORY(UI)