Skip to content
Snippets Groups Projects
Commit 7088155a authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Graeme Stewart
Browse files

Disabling the install(...) command for the CMake build (AtlasGPerfTools-00-00-13)

	* Disabled the installation of the now absent build results. To
	  avoid a problem during the installation step of AtlasExternals.
	* Tagging as AtlasGPerfTools-00-00-13

2016-08-24 Antonio Limosani <Antonio.Limosani@cern.ch>
	* Pick up tcmalloc from LCG build
	* Tagging as AtlasGPerfTools-00-00-12


Former-commit-id: 5f821f9c85238ba8d837f12820c9b9327432bfd0
parent 79c32e3f
No related branches found
No related tags found
No related merge requests found
# $Id: AtlasGPerfToolsEnvironmentConfig.cmake.in 725718 2016-02-23 14:23:07Z krasznaa $
# $Id: AtlasGPerfToolsEnvironmentConfig.cmake.in 769764 2016-08-24 09:44:01Z limosani $
#
# File setting up the environment variable(s) needed for using
# GPerfTools in ATLAS.
......@@ -7,9 +7,8 @@
# The environment setting(s):
set( ATLASGPERFTOOLSENVIRONMENT_ENVIRONMENT
SET ATLAS_GPERFTOOLS_DIR
\${@CMAKE_PROJECT_NAME@_DIR}/@CMAKE_INSTALL_LIBDIR@
SET TCMALLOCDIR
\${@CMAKE_PROJECT_NAME@_DIR}/@CMAKE_INSTALL_LIBDIR@ )
@TCMALLOC_LIBRARY_DIRS@
SET TCMALLOCDIR
@TCMALLOC_LIBRARY_DIRS@ )
# Silently declare the module found:
set( ATLASGPERFTOOLSENVIRONMENT_FOUND TRUE )
# $Id: CMakeLists.txt 759447 2016-07-04 08:16:42Z krasznaa $
# $Id: CMakeLists.txt 769835 2016-08-24 11:33:37Z krasznaa $
#
# Configuration for building gperftools as part of the offline software build.
#
......@@ -13,29 +13,30 @@ endif()
# Set up a dependency on libunwind. Just to pull in its RPM for sure.
find_package( libunwind )
# Set up the build of gperftools for the build area:
ExternalProject_Add( GPerfTools
PREFIX ${CMAKE_BINARY_DIR}
URL ${CMAKE_CURRENT_SOURCE_DIR}/src/gperftools-2.2.tar.gz
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./configure --enable-shared --enable-static
--enable-frame-pointers
--prefix=${CMAKE_CURRENT_BINARY_DIR}/build
LDFLAGS=-L${LIBUNWIND_ROOT}/lib
CPPFLAGS=-I${LIBUNWIND_ROOT}/include
F9X=$ENV{FC}
BUILD_COMMAND make
COMMAND make install
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_BINARY_DIR}/build/ <INSTALL_DIR>
)
add_dependencies( Package_AtlasGPerfTools GPerfTools )
find_package( tcmalloc )
## Set up the build of gperftools for the build area:
#ExternalProject_Add( GPerfTools
# PREFIX ${CMAKE_BINARY_DIR}
# URL ${CMAKE_CURRENT_SOURCE_DIR}/src/gperftools-2.2.tar.gz
# INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
# BUILD_IN_SOURCE 1
# CONFIGURE_COMMAND ./configure --enable-shared --enable-static
# --enable-frame-pointers
# --prefix=${CMAKE_CURRENT_BINARY_DIR}/build
# LDFLAGS=-L${LIBUNWIND_ROOT}/lib
# CPPFLAGS=-I${LIBUNWIND_ROOT}/include
# F9X=$ENV{FC}
# BUILD_COMMAND make
# COMMAND make install
# INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
# ${CMAKE_CURRENT_BINARY_DIR}/build/ <INSTALL_DIR>
# )
#add_dependencies( Package_AtlasGPerfTools GPerfTools )
# Set up its installation:
install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build/
DESTINATION . USE_SOURCE_PERMISSIONS )
#install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build/
# DESTINATION . USE_SOURCE_PERMISSIONS )
# Install the package's scripts:
atlas_install_scripts( bin/atl-gpt-* )
......
......@@ -21,6 +21,7 @@ package AtlasGPerfTools
author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
## for athena policies: this has to be the first use statement
use AtlasPolicy AtlasPolicy-*
......@@ -67,3 +68,4 @@ end_private
# define path for tcmalloc needed for preloading of tcmalloc during a athena job
set TCMALLOCDIR $(AtlasGPerfTools_cmtpath)/InstallArea/$(CMTCONFIG)/lib
include_dirs $(AtlasGPerfTools_cmtpath)/InstallArea/include
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment