Merge pull request #126 from mcclure/no_assimp

Only build Assimp if also building tools

CMakeLists.txt

@@ -75,7 +75,9 @@ SET(LUA_LIBRARIES lua5.1)
 SET(LUA_INCLUDE_DIR ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/include/lua5.1)
 SET(BOX2D_RELEASE_LIBRARY Box2D)
 SET(BOX2D_INCLUDE_DIR ${POLYCODE_RELEASE_DIR}/Framework/Modules/Dependencies/include)
+IF (POLYCODE_BUILD_TOOLS)
 SET(ASSIMP_INCLUDE_DIR ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/include)
+ENDIF()
 SET(BULLET_INCLUDE_DIR ${POLYCODE_RELEASE_DIR}/Framework/Modules/Dependencies/include/bullet)
 SET(LIBBULLETCOLLISION BulletCollision)
 SET(LIBBULLETDYNAMICS BulletDynamics)

Dependencies/CMakeLists.txt

@@ -118,12 +118,14 @@ ENDIF(APPLE)
     SET(internal_BULLET ON)
 #ENDIF(BULLET_FOUND)
 
+IF(POLYCODE_BUILD_TOOLS)
 #FIND_PACKAGE(Assimp)
 #IF(ASSIMP_FOUND)
 #    SET(internal_ASSIMP OFF)
 #ELSE(ASSIMP_FOUND)
     SET(internal_ASSIMP ON)
 #ENDIF(ASSIMP_FOUND)
+ENDIF(POLYCODE_BUILD_TOOLS)
 
 OPTION(POLYCODE_DEPS_GLEXT "Download GL/glext.h header" ${internal_GLEXT})
 OPTION(POLYCODE_DEPS_WGLEXT "Download GL/wglext.h header" ${internal_WGLEXT})
@@ -171,9 +173,9 @@ IF(POLYCODE_DEPS_BULLET)
     INCLUDE(ExternalBullet)
 ENDIF(POLYCODE_DEPS_BULLET)
 
-IF(POLYCODE_DEPS_ASSIMP)
+IF(POLYCODE_DEPS_ASSIMP AND POLYCODE_BUILD_TOOLS)
     INCLUDE(ExternalAssimp)
-ENDIF(POLYCODE_DEPS_ASSIMP)
+ENDIF(POLYCODE_DEPS_ASSIMP AND POLYCODE_BUILD_TOOLS)
 
 # Use SDL on non-Apple unixes
 #IF(UNIX AND NOT APPLE)