diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-05-24 13:53:48 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-05-24 13:53:48 +0000 |
| commit | 8fcbe32f055dd1bbf2e176c024024f92c396beb0 (patch) | |
| tree | 5304447bf03f4376ffef6729a83ff71a3fae4ad6 /CIAO/connectors/dds4ccm/tests/PSAT | |
| parent | 0e030c69884f85084cb606610178d70727dd5968 (diff) | |
| download | ATCD-8fcbe32f055dd1bbf2e176c024024f92c396beb0.tar.gz | |
Mon May 24 13:53:12 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl:
Make sure that rtiddsgen doesn't pick up ccm_dds idl
* connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
Enabled several projects
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/PSAT')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl | 3 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl index 3a8126ddeaa..bc33d72c3b7 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl @@ -47,8 +47,9 @@ * Group of interfaces for the @ref PSAT connector that are only used by * @ref PSAT subscribers */ - +#if defined (__TAO_IDL) #include "ccm_dds.idl" +#endif /** * @namespace CCM_DDS_PSAT diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc index 055dcef26ee..5682dd7b20c 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc @@ -1,7 +1,6 @@ // $Id$ project (DDS_CCM_Example_PSAT_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default, dds4ccm_impl, ccm_stub { - requires += dummy_label sharedname = DDS_CCM_Example_PSAT_stub dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL libout = lib @@ -43,7 +42,7 @@ project(DDS_PSAT_Connector_idl_gen) : connectoridldefaults, dds4ccm { } } -project(DDS_PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { +project(DDS_PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm, dds4ccm_stub { custom_only = 1 after += DDS_PSAT_Connector_idl_gen idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \ @@ -56,15 +55,15 @@ project(DDS_PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } } -project(DDS_PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - requires += dummy_label - after += DDS_PSAT_Connector_lem_gen DDS_CCM_PSAT_Test_stub DDS4CCM_lem_stub - libs += DDS_CCM_PSAT_Test_stub DDS4CCM_lem_stub +project(DDS_PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += DDS_PSAT_Connector_lem_gen DDS_CCM_PSAT_Test_stub + libs += DDS_CCM_PSAT_Test_stub libpaths += lib libout = lib includes += .. sharedname = DDS_PSAT_Connector_lem_stub dynamicflags = CSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL + includes += -I $(CIAO_ROOT)/connectors/dds4ccm/idl IDL_Files { } @@ -84,9 +83,7 @@ project(DDS_PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_base { } project(DDS_CCM_PSAT_Test_stub) : ccm_stub, dds4ccm_base { - requires += dummy_label after += DDS_PSAT_Connector_idl_gen - libs += libpaths += lib libout = lib includes += -I $(CIAO_ROOT)/connectors/dds4ccm/idl |