From 4833cd21d210b33e8083473253bc9894bbe98603 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> Date: Thu, 27 Jun 2024 14:25:28 +0200 Subject: [PATCH] Updated to GeoModel-6.0.0. At the same time telling the build to put its public header files into a unique directory, separate from the rest of the headers shipped with a given project. --- External/GeoModel/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/External/GeoModel/CMakeLists.txt b/External/GeoModel/CMakeLists.txt index 266dd0e3..8a354e66 100644 --- a/External/GeoModel/CMakeLists.txt +++ b/External/GeoModel/CMakeLists.txt @@ -28,7 +28,7 @@ find_package( ZLIB ) # Declare where to get GeoModel from. set( ATLAS_GEOMODEL_SOURCE - "URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/5.3.0/GeoModel-5.3.0.tar.bz2;URL_MD5;69c41f2c12ada4d953b6452454f92a04" + "URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.0.0/GeoModel-6.0.0.tar.bz2;URL_MD5;3e239a848c7622fc894152e100bec27e" CACHE STRING "The source for GeoModel" ) mark_as_advanced( ATLAS_GEOMODEL_SOURCE ) @@ -76,6 +76,7 @@ ExternalProject_Add( GeoModel CMAKE_CACHE_ARGS -DCMAKE_PREFIX_PATH:PATH=${_prefixPaths} -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=${SQLite3_INCLUDE_DIR} + -DCMAKE_INSTALL_INCLUDEDIR:PATH=${CMAKE_INSTALL_INCLUDEDIR}/GeoModel -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} -DCMAKE_INSTALL_PREFIX:PATH=${_buildDir} -DGEOMODEL_BUILD_TOOLS:BOOL=TRUE -- GitLab