From ca98c51ecbca08daa4b9c00fffd53f7c6fdb370e Mon Sep 17 00:00:00 2001
From: Johannes Elmsheuser <johannes.elmsheuser@cern.ch>
Date: Thu, 8 Dec 2016 14:10:53 +0100
Subject: [PATCH] Update to fastjet-3.2.1 (AtlasFastJet-00-00-37)
* CMakeLists.txt: Update to fastjet-3.2.1
* Tagging as AtlasFastJet-00-00-37
2016-11-30 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Updated the code to only build the C++ plugins of FastJet.
To avoid Fortran linking problems in AnalysisBase.
* The code now makes use of ${CMAKE_FILES_DIRECTORY} to
organise the build directory a bit more neatly.
* The installation should no longer kill the project's
installation in case FastJet fails to compile.
* Tagging as AtlasFastJet-00-00-36
---
External/AtlasFastJet/CMakeLists.txt | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/External/AtlasFastJet/CMakeLists.txt b/External/AtlasFastJet/CMakeLists.txt
index 9c2c6eb6f1f..acef269c5b9 100644
--- a/External/AtlasFastJet/CMakeLists.txt
+++ b/External/AtlasFastJet/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 734317 2016-04-06 12:44:04Z krasznaa $
+# $Id: CMakeLists.txt 788623 2016-12-08 14:09:55Z elmsheus $
#
# Package building FastJet as part of the offline software build.
#
@@ -23,19 +23,20 @@ endif()
# Set up the build of FastJet for the build area:
ExternalProject_Add( FastJet
PREFIX ${CMAKE_BINARY_DIR}
- URL http://fastjet.fr/repo/fastjet-3.2.0.tar.gz
+ URL http://fastjet.fr/repo/fastjet-3.2.1.tar.gz
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
CONFIGURE_COMMAND ./configure
- --prefix=${CMAKE_CURRENT_BINARY_DIR}/build
- --enable-shared --disable-static --enable-allplugins ${_fastJetExtraConfig}
+ --prefix=${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build
+ --enable-shared --disable-static --enable-allcxxplugins
+ ${_fastJetExtraConfig}
BUILD_IN_SOURCE 1
BUILD_COMMAND make
COMMAND make install
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_CURRENT_BINARY_DIR}/build/ <INSTALL_DIR>
- )
+ ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build/ <INSTALL_DIR> )
add_dependencies( Package_AtlasFastJet FastJet )
# Set up its installation:
-install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build/
- DESTINATION . USE_SOURCE_PERMISSIONS )
+install( DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build/
+ DESTINATION . USE_SOURCE_PERMISSIONS OPTIONAL )
--
GitLab