|
|
@@ -34,36 +34,18 @@ if( MSVC )
|
|
|
else()
|
|
|
set(MSVC_PREFIX "vc150")
|
|
|
endif()
|
|
|
- set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@-${MSVC_PREFIX}-mt" CACHE STRING "the suffix for the assimp windows library" FORCE)
|
|
|
+ set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@-${MSVC_PREFIX}-mt" CACHE STRING "the suffix for the assimp windows library" )
|
|
|
else()
|
|
|
- set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the openrave libraries" FORCE)
|
|
|
+ set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the openrave libraries" )
|
|
|
endif()
|
|
|
|
|
|
set( ASSIMP_CXX_FLAGS ) # dynamically linked library
|
|
|
-if( WIN32 )
|
|
|
- # for visual studio linking, most of the time boost dlls will be used
|
|
|
- set( ASSIMP_CXX_FLAGS " -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB")
|
|
|
-endif()
|
|
|
set( ASSIMP_LINK_FLAGS "" )
|
|
|
set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_LIB_INSTALL_DIR@")
|
|
|
set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_INCLUDE_INSTALL_DIR@")
|
|
|
set( ASSIMP_LIBRARIES assimp${ASSIMP_LIBRARY_SUFFIX})
|
|
|
set( ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES}@CMAKE_DEBUG_POSTFIX@)
|
|
|
|
|
|
-# 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@")
|
|
|
-
|
|
|
# for compatibility with pkg-config
|
|
|
set(ASSIMP_CFLAGS_OTHER "${ASSIMP_CXX_FLAGS}")
|
|
|
set(ASSIMP_LDFLAGS_OTHER "${ASSIMP_LINK_FLAGS}")
|
|
|
@@ -74,7 +56,6 @@ MARK_AS_ADVANCED(
|
|
|
ASSIMP_LINK_FLAGS
|
|
|
ASSIMP_INCLUDE_DIRS
|
|
|
ASSIMP_LIBRARIES
|
|
|
- ASSIMP_Boost_VERSION
|
|
|
ASSIMP_CFLAGS_OTHER
|
|
|
ASSIMP_LDFLAGS_OTHER
|
|
|
ASSIMP_LIBRARY_SUFFIX
|
Kim Kulling