瀏覽代碼

workaround: disable config for boost.

Signed-off-by: Kim Kulling <[email protected]>
Kim Kulling 11 年之前
父節點
當前提交
7bab8cd4d9
共有 1 個文件被更改,包括 11 次插入11 次删除
  1. 11 11
      assimp-config.cmake.in

+ 11 - 11
assimp-config.cmake.in

@@ -44,20 +44,20 @@ if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
 	set( ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES}D)
 endif (CMAKE_BUILD_TYPE EQUAL "DEBUG")
 
+# search for the boost version assimp was compiled with
+#set(Boost_USE_MULTITHREAD ON)
+#set(Boost_USE_STATIC_LIBS OFF)
+#set(Boost_USE_STATIC_RUNTIME OFF)
+#find_package(Boost ${ASSIMP_Boost_VERSION} EXACT COMPONENTS thread date_time)
+#if(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+#	set( ASSIMP_INCLUDE_DIRS "${ASSIMP_INCLUDE_DIRS}" ${Boost_INCLUDE_DIRS})
+#else(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+#	message(WARNING "Failed to find Boost ${ASSIMP_Boost_VERSION} necessary for assimp")
+#endif(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+
 # the boost version assimp was compiled with
 set( ASSIMP_Boost_VERSION "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@")
 
-# search for the boost version assimp was compiled with
-set(Boost_USE_MULTITHREAD ON)
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost ${ASSIMP_Boost_VERSION} EXACT COMPONENTS thread date_time)
-if(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
-	set( ASSIMP_INCLUDE_DIRS "${ASSIMP_INCLUDE_DIRS}" ${Boost_INCLUDE_DIRS})
-else(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
-	message(WARNING "Failed to find Boost ${ASSIMP_Boost_VERSION} necessary for assimp")
-endif(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
-
 # for compatibility wiht pkg-config
 set(ASSIMP_CFLAGS_OTHER "${ASSIMP_CXX_FLAGS}")
 set(ASSIMP_LDFLAGS_OTHER "${ASSIMP_LINK_FLAGS}")