diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-08-04 14:49:54 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-08-04 14:49:54 +0000 |
| commit | 05e9ad5b9e5817ac9a4883e2a6d4d3914c2e57cf (patch) | |
| tree | f686afc9cf272461dbfba3bb7e47aefd38b491fa | |
| parent | 638e49c45509877a9a6db07b54e9e71a0109429e (diff) | |
| download | ATCD-05e9ad5b9e5817ac9a4883e2a6d4d3914c2e57cf.tar.gz | |
ChangeLogTag: Wed Aug 4 14:48:11 UTC 2010 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/tao.mpc | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d765e7a7b0a..78634329e27 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Aug 4 14:48:11 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * tao/tao.mpc: + + orb.idl is not a Template_File. Adding it to that list causes + uninteded side-effects that produce an unusable project with vc10. + Moved it to the PIDL_Files so that it will continue to not be + compiled by tao_idl. + Wed Aug 4 14:43:14 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Notify/XML_Loader.h: diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 62ad7de1582..092233ffebf 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -658,7 +658,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid Condition.cpp Connector_Impl.cpp TAO_Singleton.cpp - orb.idl } Pkgconfig_Files { @@ -668,6 +667,10 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid IDL_Files { } + PIDL_Files { + orb.idl // not compiled + } + InstallData_Files { gendir = . ../rules.tao.GNU |