diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-09 18:52:02 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-09 18:52:02 +0000 |
| commit | 930ee6f6144de4ac8e2836b38ad377c35be4817e (patch) | |
| tree | 5035ec41698ae4eef9fc49b323e55881555bb70e /TAO/TAO_IDL | |
| parent | 695b734a0dac834e5644201373431b8f6192b490 (diff) | |
| download | ATCD-930ee6f6144de4ac8e2836b38ad377c35be4817e.tar.gz | |
ChangeLogTag: Thu Feb 9 18:25:38 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/TAO_IDL')
| -rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 36d8bbc09ed..ef364aafb9c 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -283,6 +283,7 @@ DRV_cpp_init (void) // TAO_IDL_INCLUDE_DIR should be in quotes, // e.g. "/usr/local/include/tao" ACE_OS::strcat (option1, TAO_IDL_INCLUDE_DIR); + ACE_OS::strcat (option2, "."); #else ACE_ERROR ((LM_WARNING, "NOTE: The environment variables " @@ -297,11 +298,9 @@ DRV_cpp_init (void) DRV_cpp_putarg (option1); idl_global->add_include_path (ACE_CString (option1 + 2).c_str ()); - idl_global->tao_root (option1 + 2); -#if !defined (TAO_IDL_INCLUDE_DIR) DRV_cpp_putarg (option2); idl_global->add_include_path (ACE_CString (option2 + 2).c_str ()); -#endif /* TAO_IDL_INCLUDE_DIR */ + idl_global->tao_root (option1 + 2); } // Add any flags in cpp_args to cpp's arglist. @@ -482,20 +481,9 @@ DRV_cpp_post_init (void) } else { -#if defined (TAO_IDL_INCLUDE_DIR) - // TAO_IDL_INCLUDE_DIR should be in quotes, - // e.g. "/usr/local/include/tao" - ACE_OS::strcat (option3, TAO_IDL_INCLUDE_DIR); - ACE_OS::strcat (option4, TAO_IDL_INCLUDE_DIR); - ACE_OS::strcat (option5, TAO_IDL_INCLUDE_DIR); - ACE_OS::strcat (option3, "/orbsvcs"); - ACE_OS::strcat (option4, "/CIAO"); - ACE_OS::strcat (option5, "/CIAO/ciao"); -#else ACE_OS::strcat (option3, "."); ACE_OS::strcat (option4, "."); ACE_OS::strcat (option5, "."); -#endif } } |