diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-22 13:25:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-22 13:25:24 +0000 |
| commit | 512418e436fc2f039e50683a7999aa9f0ca22306 (patch) | |
| tree | d5a1527f79c0e4bbca7f785097d04e486ec30a63 | |
| parent | d01203eb49e2473da8c94ed00be0276479d5cf1c (diff) | |
| download | ATCD-512418e436fc2f039e50683a7999aa9f0ca22306.tar.gz | |
Wed Nov 22 13:25:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/ace/ace_for_tao.mpc | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index da675cb9f21..c4c4429fd3d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Wed Nov 22 13:25:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc: + Add uuid as base project. For building COIOP as part of the + TAO strategies library we need uuid. The nicest solution would + be to make the uuid feature dependent on the ace_for_tao + feature and let the user overrule this but that is not + possible yet. If you are using ace_for_tao and don't want + to have uuid pulled in, set uuid explicitly to 0 in your + default.features file. + Wed Nov 22 10:48:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Log_Msg.cpp: diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index cd28be5635b..d3727e454f3 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -11,7 +11,7 @@ // link. This ACE_FOR_TAO subset library must remain as small as // possible. -project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfig { +project(ACE_FOR_TAO) : acedefaults, core, svcconf, uuid, versioned_namespace, pkgconfig { macros += ACE_LACKS_ACE_TOKEN requires = ace_for_tao ace_svcconf libout = $(ACE_ROOT)/lib |