Fixed libxerces-c installation.

Util/BuildTools/BuildOSM2ODR.bat

@@ -20,7 +20,7 @@ set USAGE_STRING=Usage: %FILE_N% [-h^|--help] [--rebuild] [--build] [--clean] [-
 set REMOVE_INTERMEDIATE=false
 set BUILD_OSM2ODR=false
 set GIT_PULL=true
-set CURRENT_OSM2ODR_COMMIT=f05c86588f797922758f1a7a50585a3aa969c17a
+set CURRENT_OSM2ODR_COMMIT=31873ad162b0d2ee64b2bbce8199eee96c22938a
 set OSM2ODR_BRANCH=carla_osm2odr
 set OSM2ODR_REPO=https://github.com/carla-simulator/sumo.git
 

Util/BuildTools/BuildOSM2ODR.sh

@@ -14,7 +14,7 @@ END
 REMOVE_INTERMEDIATE=false
 BUILD_OSM2ODR=false
 GIT_PULL=true
-CURRENT_OSM2ODR_COMMIT=f05c86588f797922758f1a7a50585a3aa969c17a
+CURRENT_OSM2ODR_COMMIT=31873ad162b0d2ee64b2bbce8199eee96c22938a
 OSM2ODR_BRANCH=carla_osm2odr
 OSM2ODR_REPO=https://github.com/carla-simulator/sumo.git
 

Util/BuildTools/Setup.bat

@@ -192,6 +192,7 @@ rem ============================================================================
 echo %FILE_N% Installing Xercesc...
 call "%INSTALLERS_DIR%install_xercesc.bat"^
  --build-dir "%INSTALLATION_DIR%"
+copy %INSTALLATION_DIR%\xerces-c-3.2.3-install\lib\xerces-c.lib %CARLA_PYTHON_DEPENDENCIES%\lib
 
 rem ============================================================================
 rem -- Download and install Sqlite3 --------------------------------------------

Util/BuildTools/Setup.sh

@@ -433,6 +433,7 @@ XERCESC_REPO=https://ftp.cixug.es/apache//xerces/c/3/sources/xerces-c-${XERCESC_
 
 XERCESC_SRC_DIR=${XERCESC_BASENAME}-source
 XERCESC_INSTALL_DIR=${XERCESC_BASENAME}-install
+XERCESC_LIB=${XERCESC_INSTALL_DIR}/lib/libxerces-c.a
 
 if [[ -d ${XERCESC_INSTALL_DIR} ]] ; then
   log "Xerces-c already installed."
@@ -465,6 +466,9 @@ else
   rm -Rf ${XERCESC_SRC_DIR}
 fi
 
+mkdir -p ${LIBCARLA_INSTALL_CLIENT_FOLDER}/lib/
+cp ${XERCESC_LIB} ${LIBCARLA_INSTALL_CLIENT_FOLDER}/lib/
+
 if ${USE_CHRONO} ; then
 
   # ==============================================================================