deps_builder: OpenCollada fixes for windows

- build and use our version of libxml

- the cli tools had a linker error due
to it trying to link a shared version
of libxml, disabled both and zlib 1.2.3
with a patch since we do not want/need
them for blender.

- postfix the libraries with _d for debug
automatically so we don't have to fix that
during the harvest.

due to this only being windows changes no
rebuild needed for the other platforms.

build_files/build_environment/CMakeLists.txt

@@ -97,6 +97,8 @@ include(cmake/embree.cmake)
 include(cmake/openpgl.cmake)
 include(cmake/fmt.cmake)
 include(cmake/robinmap.cmake)
+include(cmake/xml2.cmake)
+
 if(NOT APPLE)
   include(cmake/xr_openxr.cmake)
   if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
@@ -149,7 +151,6 @@ if(NOT WIN32 OR ENABLE_MINGW64)
     endif()
     if(UNIX)
       include(cmake/flac.cmake)
-      include(cmake/xml2.cmake)
       if(NOT APPLE)
         include(cmake/spnav.cmake)
         include(cmake/jemalloc.cmake)

build_files/build_environment/cmake/opencollada.cmake

@@ -4,6 +4,16 @@ if(UNIX)
   set(OPENCOLLADA_EXTRA_ARGS
     -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
     -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
+else()
+  set(OPENCOLLADA_EXTRA_ARGS
+    -DCMAKE_DEBUG_POSTFIX=_d
+    -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
+  )
+  if(BUILD_MODE STREQUAL Release)
+    list(APPEND  OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2s.lib)
+  else()
+    list(APPEND  OPENCOLLADA_EXTRA_ARGS -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2sd.lib)
+  endif()
 endif()
 
 ExternalProject_Add(external_opencollada
@@ -16,12 +26,11 @@ ExternalProject_Add(external_opencollada
   INSTALL_DIR ${LIBDIR}/opencollada
 )
 
-if(UNIX)
+
-  add_dependencies(
+add_dependencies(
-    external_opencollada
+  external_opencollada
-    external_xml2
+  external_xml2
-  )
+)
-endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
@@ -32,17 +41,7 @@ if(WIN32)
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/lib ${HARVEST_TARGET}/opencollada/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/xml2.cmake

@@ -1,20 +1,48 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-ExternalProject_Add(external_xml2
+if(WIN32)
-  URL file://${PACKAGE_DIR}/${XML2_FILE}
+  set(XML2_EXTRA_ARGS 
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    -DLIBXML2_WITH_ZLIB=OFF
-  URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
+    -DLIBXML2_WITH_LZMA=OFF
-  PREFIX ${BUILD_DIR}/xml2
+    -DLIBXML2_WITH_PYTHON=OFF
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
+    -DLIBXML2_WITH_ICONV=OFF
-    --prefix=${LIBDIR}/xml2
+    -DLIBXML2_WITH_TESTS=OFF
-    --disable-shared
+    -DLIBXML2_WITH_PROGRAMS=OFF
-    --enable-static
+    -DBUILD_SHARED_LIBS=OFF
-    --with-pic
+  )
-    --with-python=no
+  ExternalProject_Add(external_xml2
-    --with-lzma=no
+    URL file://${PACKAGE_DIR}/${XML2_FILE}
-    --with-zlib=no
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    --with-iconv=no
+    URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xml2 ${DEFAULT_CMAKE_FLAGS} ${XML2_EXTRA_ARGS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
+    PREFIX ${BUILD_DIR}/xml2
-  INSTALL_DIR ${LIBDIR}/xml2
+    INSTALL_DIR ${LIBDIR}/xml2
-)
+  )
+else()
+  ExternalProject_Add(external_xml2
+    URL file://${PACKAGE_DIR}/${XML2_FILE}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
+    PREFIX ${BUILD_DIR}/xml2
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
+      --prefix=${LIBDIR}/xml2
+      --disable-shared
+      --enable-static
+      --with-pic
+      --with-python=no
+      --with-lzma=no
+      --with-zlib=no
+      --with-iconv=no
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
+    INSTALL_DIR ${LIBDIR}/xml2
+  )
+endif()
+
+if(WIN32 AND BUILD_MODE STREQUAL Release)
+  ExternalProject_Add_Step(external_xml2 after_install
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xml2/include  ${HARVEST_TARGET}/xml2/include
+        COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xml2/lib/libxml2s.lib  ${HARVEST_TARGET}/xml2/lib/libxml2s.lib
+    DEPENDEES install
+  )
+endif()