diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt index b85e9e4e2a572520bf50b7593a7460b674ecbbc9..29f8dbf089caf40e128999b87999c0c8ad148f75 100644 --- a/Projects/AthDataQuality/CMakeLists.txt +++ b/Projects/AthDataQuality/CMakeLists.txt @@ -17,13 +17,6 @@ set( TDAQ-COMMON_ATROOT "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" CACHE PATH "The directory to pick up tdaq-common from" ) -# Set the version of dqm-common to use for the build: -set( DQM-COMMON_VERSION "00-00-00" CACHE STRING - "The version of dqm-common to use for the build" ) -set( DQM-COMMON_ATROOT - "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" - CACHE PATH "The directory to pick up dqm-common from" ) - # Pick up the AtlasCMake code: find_package( AtlasCMake REQUIRED ) @@ -80,10 +73,6 @@ string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}" TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" ) string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}" TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" ) -string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}" - DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" ) -string( REPLACE "${DQM-COMMON_VERSION}" "\${DQM-COMMON_VERSION}" - DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" ) configure_file( ${CMAKE_SOURCE_DIR}/PostConfig.cmake.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake @ONLY ) install( FILES ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake diff --git a/Projects/AthDataQuality/PostConfig.cmake.in b/Projects/AthDataQuality/PostConfig.cmake.in index 29b54887ad02cdf3452dfd612745893aa8281c9b..ce52a63795eecbede8a520ab7d44b04021388a1d 100644 --- a/Projects/AthDataQuality/PostConfig.cmake.in +++ b/Projects/AthDataQuality/PostConfig.cmake.in @@ -8,8 +8,3 @@ set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" CACHE STRING "The version of tdaq-common to use for the build" ) set( TDAQ-COMMON_ATROOT "@TDAQ-COMMON_ATROOT@" CACHE PATH "The directory to pick up tdaq-common from" ) - -set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" CACHE STRING - "The version of dqm-common to use for the build" ) -set( DQM-COMMON_ATROOT "@DQM-COMMON_ATROOT@" CACHE PATH - "The directory to pick up dqm-common from" ) diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index f8dde65824c6d7509b8ad2690280c562a9c1fd2b..fc404a6add229d0658b3dff58e60f7a328ec4f1d 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -23,15 +23,11 @@ if( LCG_NIGHTLY ) # TDAQ_RELEASE_BASE should be set to a NIGHTLY TDAQ build! set( TDAQ-COMMON_VERSION "99-00-00" CACHE STRING "The version of tdaq-common to use for the build" ) - set( DQM-COMMON_VERSION "99-00-00" CACHE STRING - "The version of dqm-common to use for the build" ) set( TDAQ_VERSION "99-00-00" CACHE STRING "The version of tdaq to use for the build" ) else() set( TDAQ-COMMON_VERSION "03-00-00" CACHE STRING "The version of tdaq-common to use for the build" ) - set( DQM-COMMON_VERSION "00-00-00" CACHE STRING - "The version of dqm-common to use for the build" ) set( TDAQ_VERSION "08-01-02" CACHE STRING "The version of tdaq to use for the build" ) endif() @@ -39,14 +35,11 @@ endif() set( TDAQ-COMMON_ATROOT "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" CACHE PATH "The directory to pick up tdaq-common from" ) -set( DQM-COMMON_ATROOT - "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" - CACHE PATH "The directory to pick up dqm-common from" ) set( TDAQ_PROJECT_NAME "tdaq" CACHE STRING "The name of the tdaq project" ) set( TDAQ_ATROOT "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}" CACHE PATH "The directory to pick up tdaq from" ) -mark_as_advanced( TDAQ-COMMON_ATROOT DQM-COMMON_ATROOT TDAQ_PROJECT_NAME +mark_as_advanced( TDAQ-COMMON_ATROOT TDAQ_PROJECT_NAME TDAQ_ATROOT ) # Find the ATLAS CMake code: @@ -111,10 +104,6 @@ string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}" TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" ) string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}" TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" ) -string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}" - DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" ) -string( REPLACE "${DQM-COMMON_VERSION}" "\${DQM-COMMON_VERSION}" - DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" ) # Temporarily add tdaq dependency to Athena build: string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}" diff --git a/Projects/Athena/PostConfig.cmake.in b/Projects/Athena/PostConfig.cmake.in index 1140a49ce202d80d35a735ae775c137671e90a75..11c8073139c6fd0f5a70512150efc3520132e2fa 100644 --- a/Projects/Athena/PostConfig.cmake.in +++ b/Projects/Athena/PostConfig.cmake.in @@ -16,11 +16,6 @@ set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" CACHE STRING set( TDAQ-COMMON_ATROOT "@TDAQ-COMMON_ATROOT@" CACHE PATH "The directory to pick up tdaq-common from" ) -set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" CACHE STRING - "The version of dqm-common to use for the build" ) -set( DQM-COMMON_ATROOT "@DQM-COMMON_ATROOT@" CACHE PATH - "The directory to pick up dqm-common from" ) - # Find Gaudi: if( Athena_FIND_QUIETLY ) find_package( Gaudi REQUIRED QUIET )