Fix last-minute bugs ironically introduced by cleaning up for pull request

CMake/ExternalOggVorbis.cmake

@@ -9,13 +9,6 @@ SET(oggvorbis_CMAKE_ARGS
 	-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 )
 
-IF (MINGW)
-	SET(oggvorbis_CMAKE_ARGS ${oggvorbis_CMAKE_ARGS}
-		-DOGG_LIBRARY=libogg
-		-DOGG_INCLUDE_DIR=${install_dir}/include
-	)
-ENDIF(MINGW)
-
 EXTERNALPROJECT_ADD(libogg
     PREFIX ${oggvorbis_PREFIX}
 
@@ -31,6 +24,13 @@ EXTERNALPROJECT_ADD(libogg
 
 ExternalProject_Get_Property(libogg install_dir)
 
+IF (MINGW)
+	SET(oggvorbis_CMAKE_ARGS ${oggvorbis_CMAKE_ARGS}
+		-DOGG_LIBRARY=libogg
+		-DOGG_INCLUDE_DIR=${install_dir}/include
+	)
+ENDIF(MINGW)
+
 EXTERNALPROJECT_ADD(libvorbis
     DEPENDS libogg
     PREFIX ${oggvorbis_PREFIX}

CMake/ExternalPNG.cmake

@@ -12,13 +12,6 @@ SET(libpng_CMAKE_ARGS
     -DSKIP_INSTALL_FILES=1
 )
 
-IF (MINGW)
-	SET(libpng_CMAKE_ARGS ${libpng_CMAKE_ARGS}
-		-DZLIB_LIBRARY=zlib
-		-DZLIB_INCLUDE_DIR=${install_dir}/include
-	)
-ENDIF(MINGW)
-
 EXTERNALPROJECT_ADD(zlib
     PREFIX ${libpng_PREFIX}
 
@@ -34,6 +27,13 @@ EXTERNALPROJECT_ADD(zlib
 
 ExternalProject_Get_Property(zlib install_dir)
 
+IF (MINGW)
+	SET(libpng_CMAKE_ARGS ${libpng_CMAKE_ARGS}
+		-DZLIB_LIBRARY=zlib
+		-DZLIB_INCLUDE_DIR=${install_dir}/include
+	)
+ENDIF(MINGW)
+
 EXTERNALPROJECT_ADD(libpng
     DEPENDS zlib
     PREFIX ${libpng_PREFIX}

CMake/zlib.cmake

@@ -118,7 +118,7 @@ IF (NOT MINGW)
 	set(ZLIB_SRCS ${ZLIB_SRCS}
 		win32/zlib1.rc # If present will override custom build rule below.s
 	)
-ENDIF
+ENDIF()
 
 # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)