Merge branch 'AthDataQualityWorkDirFix-21.0-20180430' into '21.0'

AthDataQuality WorkDir Compatibility Fix, 21.0 branch (2018.04.30.)

See merge request atlas/athena!10869

Former-commit-id: 80c4093d7bd438cc1b923e5ab9393bdb10650b85

Projects/AthDataQuality/CMakeLists.txt

@@ -33,6 +33,7 @@ set( LCG_VERSION_NUMBER 88
    CACHE STRING "Version number for the LCG release to use" )
 find_package( LCG ${LCG_VERSION_NUMBER} EXACT REQUIRED )
 
+# Extra packages to find, for a "healthy" runtime environment:
 find_package( Xrootd )
 find_package( GSL )
 find_package( Frontier_Client )
@@ -82,9 +83,13 @@ string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
    DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
 string( REPLACE "${DQM-COMMON_VERSION}" "\${DQM-COMMON_VERSION}"
    DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
+configure_file( ${CMAKE_SOURCE_DIR}/PreConfig.cmake.in
+   ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake @ONLY )
 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
+install( FILES
+   ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PreConfig.cmake
+   ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake
    DESTINATION ${CMAKE_INSTALL_CMAKEDIR} )
 
 # Set up CPack:

Projects/AthDataQuality/PreConfig.cmake.in

+#
+# File taking care of pointing the downstream projects at the right
+# version of LCG.
+#
+
+# Find LCG:
+set( LCG_VERSION_POSTFIX @LCG_VERSION_POSTFIX@ )
+if( AthDataQuality_FIND_QUIETLY )
+   find_package( LCG @LCG_VERSION_NUMBER@ REQUIRED EXACT QUIET )
+else()
+   find_package( LCG @LCG_VERSION_NUMBER@ REQUIRED EXACT )
+endif()