v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: remove WIN32-lookup for boost setup because these features are platform independent. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/261/head^2
Kim Kulling 2014-04-26 09:59:27 +02:00
parent f63cf6b5c8
commit d49837819e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
assimp-config.cmake.in
View File

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