diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index ac054e508..4b4277a74 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -29,7 +29,7 @@ IF(APPLE) ELSEIF(MINGW) SET(COLLADA_BUILDNAME "mingw") ELSEIF(MSVC14) - SET(COLLADA_BUILDNAME "vc14") + SET(COLLADA_BUILDNAME "vc14") ELSEIF(MSVC12) SET(COLLADA_BUILDNAME "vc12") ELSEIF(MSVC11) @@ -186,16 +186,16 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG FIND_PACKAGE(ZLIB) IF (ZLIB_FOUND) - IF (ZLIB_LIBRARY_RELEASE) - SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY_RELEASE}" CACHE FILEPATH "" FORCE) - ELSE(ZLIB_LIBRARY_RELEASE) - SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE) - ENDIF(ZLIB_LIBRARY_RELEASE) - IF (ZLIB_LIBRARY_DEBUG) - SET(COLLADA_ZLIB_LIBRARY_DEBUG "${ZLIB_LIBRARY_DEBUG}" CACHE FILEPATH "" FORCE) - ELSE(ZLIB_LIBRARY_DEBUG) - SET(COLLADA_ZLIB_LIBRARY_DEBUG "${COLLADA_ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE) - ENDIF(ZLIB_LIBRARY_DEBUG) + IF (ZLIB_LIBRARY_RELEASE) + SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY_RELEASE}" CACHE FILEPATH "" FORCE) + ELSE(ZLIB_LIBRARY_RELEASE) + SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE) + ENDIF(ZLIB_LIBRARY_RELEASE) + IF (ZLIB_LIBRARY_DEBUG) + SET(COLLADA_ZLIB_LIBRARY_DEBUG "${ZLIB_LIBRARY_DEBUG}" CACHE FILEPATH "" FORCE) + ELSE(ZLIB_LIBRARY_DEBUG) + SET(COLLADA_ZLIB_LIBRARY_DEBUG "${COLLADA_ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE) + ENDIF(ZLIB_LIBRARY_DEBUG) ELSE(ZLIB_FOUND) IF(WIN32) FIND_LIBRARY(COLLADA_ZLIB_LIBRARY