Merge remote-tracking branch 'official/master' into contrib

Conflicts:
	contrib/zlib/CMakeLists.txt

CMakeLists.txt

@@ -73,7 +73,7 @@ IF (NOT TARGET uninstall)
 	add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 ENDIF()
 
-# Globally enbale Boost resp. the Boost workaround – it is also needed by the
+# Globally enable Boost resp. the Boost workaround – it is also needed by the
 # tools which include the Assimp headers.
 SET ( ASSIMP_ENABLE_BOOST_WORKAROUND ON CACHE BOOL
 	"If a simple implementation of the used Boost functions is used. Slightly reduces functionality, but enables builds without Boost available."

assimp-config.cmake.in

@@ -40,6 +40,9 @@ 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})
+if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
+	set( ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES}D)
+endif (CMAKE_BUILD_TYPE EQUAL "DEBUG")
 
 # the boost version assimp was compiled with
 set( ASSIMP_Boost_VERSION "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@")

contrib/zlib/CMakeLists.txt

@@ -184,45 +184,4 @@ if(MINGW)
     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
 endif(MINGW)
 
-#add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-#set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-#set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-#if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-    #set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-#endif()
-
-#if(UNIX)
-    # On unix-like platforms the library is almost always called libz
-    #set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-    #if(NOT APPLE)
-    #  set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-    #endif()
-#elseif(BUILD_SHARED_LIBS AND WIN32)
-#    # Creates zlib1.dll when building shared library version
-#    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-#endif()
-
-#if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-#    install(TARGETS zlib zlibstatic
-#        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-#        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-#        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-#endif()
-#if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-#    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
-#endif()
-#if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-#    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
-#endif()
-#if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-#    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-#endif()