|
@@ -232,32 +232,30 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
|
|
|
SET(C4D_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Melange/includes")
|
|
|
|
|
|
# pick the correct prebuilt library
|
|
|
- IF(MSVC14)
|
|
|
- SET(C4D_LIB_POSTFIX "_2015")
|
|
|
- ELSEIF(MSVC12)
|
|
|
- SET(C4D_LIB_POSTFIX "_2013")
|
|
|
- ELSEIF(MSVC11)
|
|
|
- SET(C4D_LIB_POSTFIX "_2012")
|
|
|
+ IF(MSVC14)
|
|
|
+ SET(C4D_LIB_POSTFIX "_2015")
|
|
|
+ ELSEIF(MSVC12)
|
|
|
+ SET(C4D_LIB_POSTFIX "_2013")
|
|
|
+ ELSEIF(MSVC11)
|
|
|
+ SET(C4D_LIB_POSTFIX "_2012")
|
|
|
ELSEIF(MSVC10)
|
|
|
- SET(C4D_LIB_POSTFIX "_2010")
|
|
|
- ELSEIF(MSVC90)
|
|
|
- SET(C4D_LIB_POSTFIX "_2008")
|
|
|
+ SET(C4D_LIB_POSTFIX "_2010")
|
|
|
ELSE()
|
|
|
MESSAGE( FATAL_ERROR
|
|
|
- "C4D is currently only supported with MSVC 9, 10, 11, 12, 14"
|
|
|
+ "C4D is currently only supported with MSVC 10, 11, 12, 14"
|
|
|
)
|
|
|
ENDIF()
|
|
|
|
|
|
- SET(C4D_LIB_BASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Melange/libraries/win")
|
|
|
+ SET(C4D_LIB_BASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Melange/libraries/win")
|
|
|
|
|
|
- SET(C4D_DEBUG_LIBRARY
|
|
|
- "${C4D_LIB_BASE_PATH}/melangelib${C4D_LIB_POSTFIX}/melangelib_debug.lib"
|
|
|
- "${C4D_LIB_BASE_PATH}/jpeglib${C4D_LIB_POSTFIX}/jpeglib_debug.lib"
|
|
|
- )
|
|
|
- SET(C4D_RELEASE_LIBRARY
|
|
|
- "${C4D_LIB_BASE_PATH}/melangelib${C4D_LIB_POSTFIX}/melangelib_release.lib"
|
|
|
- "${C4D_LIB_BASE_PATH}/jpeglib${C4D_LIB_POSTFIX}/jpeglib_release.lib"
|
|
|
- )
|
|
|
+ SET(C4D_DEBUG_LIBRARIES
|
|
|
+ "${C4D_LIB_BASE_PATH}/melangelib${C4D_LIB_POSTFIX}/melangelib_debug.lib"
|
|
|
+ "${C4D_LIB_BASE_PATH}/jpeglib${C4D_LIB_POSTFIX}/jpeglib_debug.lib"
|
|
|
+ )
|
|
|
+ SET(C4D_RELEASE_LIBRARIES
|
|
|
+ "${C4D_LIB_BASE_PATH}/melangelib${C4D_LIB_POSTFIX}/melangelib_release.lib"
|
|
|
+ "${C4D_LIB_BASE_PATH}/jpeglib${C4D_LIB_POSTFIX}/jpeglib_release.lib"
|
|
|
+ )
|
|
|
|
|
|
# winsock and winmm are necessary dependencies of melange (this is undocumented, but true.)
|
|
|
SET(C4D_EXTRA_LIBRARIES WSock32.lib Winmm.lib)
|