Fixing the issues that showed up in the CI builds.

It turns out that on SLC6 automake uses the lib/ directory
for libraries by default, while CMake would prefer to use lib64...

It also turned out that the CentOS 7 image didn't have GNU Make
installed in it by default.

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 
 # Common setup for the CI Docker images.
 before_script:
-  - yum -y install glibc-devel which git
+  - yum -y install glibc-devel which git make
   - set +e && source CI/setup_lcg.sh; set -e
 
 # Build the upstream project(s) needed by this one.

cmake/SetupXercesC.cmake

@@ -19,7 +19,7 @@ if( GEOMODEL_USE_BUILTIN_XERCESC )
       "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_INCLUDEDIR}" )
    set( XercesC_INCLUDE_DIRS "${XercesC_INCLUDE_DIR}" )
    set( XercesC_LIBRARY
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}xerces-c${CMAKE_SHARED_LIBRARY_SUFFIX}" )
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib/${CMAKE_SHARED_LIBRARY_PREFIX}xerces-c${CMAKE_SHARED_LIBRARY_SUFFIX}" )
    set( XercesC_LIBRARIES "${XercesC_LIBRARY}" )
 
    # Create the include directory already, otherwise CMake refuses to
@@ -38,13 +38,13 @@ if( GEOMODEL_USE_BUILTIN_XERCESC )
       <SOURCE_DIR>/configure --disable-static --prefix=<INSTALL_DIR>
       INSTALL_COMMAND make install
       COMMAND ${CMAKE_COMMAND} -E remove -f
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}xerces-c.la"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib/${CMAKE_SHARED_LIBRARY_PREFIX}xerces-c.la"
       COMMAND ${CMAKE_COMMAND} -E remove_directory
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib/pkgconfig"
       BUILD_BYPRODUCTS "${XercesC_INCLUDE_DIR}" "${XercesC_LIBRARY}" )
    install( DIRECTORY
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_BINDIR}"
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_LIBDIR}"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/bin"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/lib"
       DESTINATION .
       COMPONENT Runtime
       USE_SOURCE_PERMISSIONS )