diff --git a/cmake/customthirdparty.cmake b/cmake/customthirdparty.cmake
index b3ec7d9d..217873c8 100644
--- a/cmake/customthirdparty.cmake
+++ b/cmake/customthirdparty.cmake
@@ -167,7 +167,7 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
 	
 	# Expat : Replaces bundled libs/txml (that will soon be removed).
 	IF(OPTION_3RDPARTY_EXPAT)
-		_FIND_3RDPARTY_DEPENDENCY(EXPAT expat.h "" expat ${ROOT_DIR} "")
+		_FIND_3RDPARTY_DEPENDENCY(EXPAT expat.h "" "expat;expat-1" ${ROOT_DIR} "")
 	ENDIF(OPTION_3RDPARTY_EXPAT)
 	
 	# FreeSOLID : Replaces bundled modules/simu/.../SOLID2.0 (that will soon be removed).
@@ -180,7 +180,7 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
 	ENDIF(OPTION_3RDPARTY_SOLID)
 	
 	# JPEG.
-	_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" "jpeg_s;jpeg" ${ROOT_DIR} "")
+	_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" "jpeg_s;jpeg;jpeg-8;jpeg-9" ${ROOT_DIR} "")
 	
 	# ZLib.
 	_FIND_3RDPARTY_DEPENDENCY(ZLIB zlib.h "" "z;zlib;zlib1" ${ROOT_DIR} "D")
@@ -374,7 +374,7 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME)
 
 	ENDIF(OPTION_3RDPARTY_SOLID)
 
-	_FIND_3RDPARTY_DLL("${ZLIB_LIBRARY}" "zlib" "lib" _DLL_PATHNAME)
+	_FIND_3RDPARTY_DLL("${ZLIB_LIBRARY}" "zlib;zlib1" "lib" _DLL_PATHNAME)
 	LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
 
 	_FIND_3RDPARTY_DLL("${PNG_LIBRARY}" "png;png15;png16" "lib" _DLL_PATHNAME)
diff --git a/cmake/internaldeps.cmake b/cmake/internaldeps.cmake
index 6a8bccd9..fb614406 100644
--- a/cmake/internaldeps.cmake
+++ b/cmake/internaldeps.cmake
@@ -228,6 +228,8 @@ MACRO(ADD_SDLIB_LIBRARY TARGET)
       SET(SDLIB_EXTRA_LIBRARY "")
 
       #Use IF(TARGET ${SDLIB_LIB}) from CMake 2.6
+	  cmake_policy(SET CMP0026 OLD)
+	  cmake_policy(SET CMP0045 OLD)
       GET_TARGET_PROPERTY(SDLIB_TARGET_LOCATION ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX} LOCATION)
       IF(NOT SDLIB_TARGET_LOCATION STREQUAL "NOTFOUND")
         SET(SDLIB_LIBRARIES ${SDLIB_LIBRARIES} ${SDLIB_LIB}${SDLIB_TARGET_SUFFIX})
diff --git a/cmake/macros.cmake b/cmake/macros.cmake
index adf1ba44..c58594db 100644
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@@ -239,7 +239,8 @@ MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
     ENDIF()
 
   ELSEIF(${TARGET_TYPE} STREQUAL "MODULE")
-
+	cmake_policy(SET CMP0026 OLD)
+	cmake_policy(SET CMP0045 OLD)
     GET_TARGET_PROPERTY(_TGT_LOC ${TARGET_NAME} LOCATION)
     GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_LOC} PATH)
     GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_TYPE} PATH)