Merge remote-tracking branch 'origin/relwithdebuginfo_build_fix'

Author: Ayla Khan

Superbuild/LibPNGExternal.cmake

@@ -25,7 +25,7 @@
 #  DEALINGS IN THE SOFTWARE.
 
 SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
-SET(libpng_GIT_TAG "origin/master")
+SET(libpng_GIT_TAG "origin/vs_build_fix")
 SET(libpng_DEPENDENCIES "Zlib_external")
 
 # If CMake ever allows overriding the checkout command or adding flags,

src/CMakeLists.txt

@@ -405,7 +405,8 @@ MESSAGE(STATUS "Configuring CPMs")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # CPM Setup.
-set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/Externals/cpm-packages" CACHE TYPE STRING)
+#set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/Externals/cpm-packages" CACHE TYPE STRING)
+set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/cpm-packages" CACHE TYPE STRING)
 find_package(Git)
 if(NOT GIT_FOUND)
   message(FATAL_ERROR "CPM requires Git.")