diff --git a/GaudiCommonSvc/cmt/requirements b/GaudiCommonSvc/cmt/requirements index a8bfac8b8a2fddc97a557ada0129167324a3b850..d57f4f2625f2236bffde6216b8fc3bd6a18756b1 100644 --- a/GaudiCommonSvc/cmt/requirements +++ b/GaudiCommonSvc/cmt/requirements @@ -34,7 +34,7 @@ library GaudiCommonSvc -no_static -import=AIDA -import=Boost -import=ROOT \ apply_pattern component_library library=GaudiCommonSvc private -macro_append Boost_linkopts " $(Boost_linkopts_system) $(Boost_linkopts_filesystem) " +macro_append Boost_linkopts " $(Boost_linkopts_system) $(Boost_linkopts_filesystem) $(Boost_linkopts_regex)" macro_append ROOT_linkopts " -lHist" \ target-winxp " libHist.lib" \ target-mac104 " -lHist" diff --git a/GaudiCommonSvc/doc/release.notes b/GaudiCommonSvc/doc/release.notes index 9c91cadf3ebaf5f75059043b65872cd54cb5b7d8..0ef0c6c54f5fdebc6016f7bdd37258f0f1a57c74 100644 --- a/GaudiCommonSvc/doc/release.notes +++ b/GaudiCommonSvc/doc/release.notes @@ -6,6 +6,9 @@ ################################################################################ ============================ GaudiCommonSvc v3r5 ============================= +! 2015-05-21 - Marco Clemencic + - Fixed compilation with CMT. + ! 2015-05-18 - Marco Clemencic - Fixed GAUDI-1036: Unchecked StatusCodes diff --git a/GaudiMonitor/cmt/requirements b/GaudiMonitor/cmt/requirements index 63691cf93e581d3c2bb212b957bd0dc20d4542cb..ae6975e900e4b8219cf88057b32fe7e9d8a23067 100644 --- a/GaudiMonitor/cmt/requirements +++ b/GaudiMonitor/cmt/requirements @@ -25,3 +25,7 @@ library GaudiMonitor -no_static *.cpp # define component library link options # ============================================================================ apply_pattern component_library library=GaudiMonitor + +private +macro_append Boost_linkopts " $(Boost_linkopts_regex)" +end_private diff --git a/GaudiMonitor/doc/release.notes b/GaudiMonitor/doc/release.notes index 3a5b5ce46045ce72afb015eafae028da2dd455f1..ac6b41121f1aaf289102721b837fe2b61b04e6f4 100644 --- a/GaudiMonitor/doc/release.notes +++ b/GaudiMonitor/doc/release.notes @@ -3,6 +3,9 @@ Package manager : Marco Clemencic Commit Id: $Format:%H$ ============================= GaudiMonitor v5r4 ============================== +! 2015-05-21 - Marco Clemencic + - Fixed compilation with CMT. + ! 2015-04-15 - Marco Clemencic - GAUDI-1024: Replaced Tokenizer (special use) with regular expression. diff --git a/GaudiSvc/cmt/requirements b/GaudiSvc/cmt/requirements index e2a10fa639bc28300f84f044004ecb21e43d5d64..8f1e54b739c992987472e5773ff21373911d3f6c 100644 --- a/GaudiSvc/cmt/requirements +++ b/GaudiSvc/cmt/requirements @@ -39,6 +39,7 @@ macro_append ROOT_linkopts "" \ ROOT_GE_5_15 " -lNet" macro_append Boost_linkopts "" target-winxp " $(Boost_linkopts_date_time) " +macro_append Boost_linkopts " $(Boost_linkopts_regex)" #application fileparse_test -group=tests ../src/tests/fileparser_test.cpp -import=Boost #macro_append fileparse_testlinkopts " -L../$(tag) -lGaudiSvc" \ diff --git a/GaudiSvc/doc/release.notes b/GaudiSvc/doc/release.notes index da6f6016ddc25a2b3ab170af6ac63cac0ba430fb..f6efac32f4eeb8907bc3cf4cdf88a0a1af5a33fa 100644 --- a/GaudiSvc/doc/release.notes +++ b/GaudiSvc/doc/release.notes @@ -3,6 +3,9 @@ Package manager : Marco Clemencic Commit Id: $Format:%H$ =============================== GaudiSvc v21r6 =============================== +! 2015-05-21 - Marco Clemencic + - Fixed compilation with CMT. + ! 2015-03-14 - Marco Clemencic - GAUDI-1024: Replaced GaudiKernel/Tokenizer with the new AttribStringParser. diff --git a/PartPropSvc/cmt/requirements b/PartPropSvc/cmt/requirements index 4981ad0764817d3d5f611db04028390c992bd3b8..3ceb193670a38f73bc8c0f176cb2e3a628bffc52 100644 --- a/PartPropSvc/cmt/requirements +++ b/PartPropSvc/cmt/requirements @@ -20,6 +20,8 @@ path_append DATAPATH "${PARTPROPSVCROOT}/share" #======================================================= private +macro_append Boost_linkopts " $(Boost_linkopts_regex)" + # get flags to build shared Component library # apply_pattern package_Cshlibflags diff --git a/PartPropSvc/doc/release.notes b/PartPropSvc/doc/release.notes index b4fed531a346f3074b6af96561d8a6c319242610..fdf8d84b4d14680c9b91ffdd31f8565ace8b2d44 100644 --- a/PartPropSvc/doc/release.notes +++ b/PartPropSvc/doc/release.notes @@ -3,6 +3,9 @@ Package manager : Charles Leggett Commit Id: $Format:%H$ ============================== PartPropSvc v6r3 ============================== +! 2015-05-21 - Marco Clemencic + - Fixed compilation with CMT. + ! 2015-04-15 - Marco Clemencic - GAUDI-1024: Replaced Tokenizer with regular expression. diff --git a/RootCnv/CMakeLists.txt b/RootCnv/CMakeLists.txt index da30ea15cc7a3a81c7416975cddbad33ab837f42..884a11a1b0399f076851ea727cf56f0ffd10100f 100644 --- a/RootCnv/CMakeLists.txt +++ b/RootCnv/CMakeLists.txt @@ -1,4 +1,4 @@ -gaudi_subdir(RootCnv v1r23p2) +gaudi_subdir(RootCnv v1r23p3) gaudi_depends_on_subdirs(GaudiKernel GaudiUtils) diff --git a/RootCnv/cmt/requirements b/RootCnv/cmt/requirements index 78fefd2d330134804cfc268eb8cdbe5a48a80c1e..87d4c3431f2ef3615abc99b2ae82658596b522bc 100644 --- a/RootCnv/cmt/requirements +++ b/RootCnv/cmt/requirements @@ -1,5 +1,5 @@ package RootCnv -version v1r23p2 +version v1r23p3 author Markus Frank @@ -42,4 +42,6 @@ macro_append ROOT_linkopts " -lTreePlayer -lMathCore " \ macro_append ROOT_cppflags '' \ target-winxp '-FI"$(ROOTSYS)/include/w32pragma.h"' +macro_append Boost_linkopts " $(Boost_linkopts_regex)" + end_private diff --git a/RootCnv/doc/release.notes b/RootCnv/doc/release.notes index 9a056d2dbf1a07dd6b6815c457ff01f33bc7b116..5085c3b8ddc45cd206f5f5d479c9f2a9d721e937 100644 --- a/RootCnv/doc/release.notes +++ b/RootCnv/doc/release.notes @@ -5,7 +5,10 @@ ! Commit Id : $Format:%H$ !----------------------------------------------------------------------------- -============================== RootCnv v1r23p2 =============================== +============================== RootCnv v1r23p3 =============================== +! 2015-05-21 - Marco Clemencic + - Fixed compilation with CMT. + ! 2015-03-14 - Marco Clemencic - GAUDI-1024: Replaced GaudiKernel/Tokenizer with the new AttribStringParser.