Skip to content

Commit 336c42f

Browse files
authored
Address cmake linter problems (ros2#51)
Signed-off-by: Jorge Perez <[email protected]>
1 parent 8fc2a06 commit 336c42f

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

performance_test/src/idlgen/opendds/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ set(ACE_ROOT ${DDS_ROOT}/../ace)
1919
set(MPC_ROOT ${DDS_ROOT}/MPC)
2020
set(TAO_ROOT ${DDS_ROOT}/../tao)
2121

22-
set(TAO_IDL DDS_ROOT=${DDS_ROOT} ACE_ROOT=${ACE_ROOT} TAO_ROOT=${TAO_ROOT} MPC_ROOT=${MPC_ROOT} LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):${ACE_ROOT}/lib:${DDS_ROOT}/lib ${ACE_ROOT}/bin/tao_idl)
23-
set(OPENDDS_IDL DDS_ROOT=${DDS_ROOT} ACE_ROOT=${ACE_ROOT} TAO_ROOT=${TAO_ROOT} MPC_ROOT=${MPC_ROOT} LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):${ACE_ROOT}/lib:${DDS_ROOT}/lib ${DDS_ROOT}/bin/opendds_idl)
22+
set(TAO_IDL DDS_ROOT=${DDS_ROOT} ACE_ROOT=${ACE_ROOT} TAO_ROOT=${TAO_ROOT} MPC_ROOT=${MPC_ROOT}
23+
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):${ACE_ROOT}/lib:${DDS_ROOT}/lib ${ACE_ROOT}/bin/tao_idl)
24+
set(OPENDDS_IDL DDS_ROOT=${DDS_ROOT} ACE_ROOT=${ACE_ROOT} TAO_ROOT=${TAO_ROOT} MPC_ROOT=${MPC_ROOT}
25+
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):${ACE_ROOT}/lib:${DDS_ROOT}/lib ${DDS_ROOT}/bin/opendds_idl)
2426
set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
2527

2628
set(IDL_SOURCE_C
@@ -99,7 +101,8 @@ foreach(idl ${IDL_SOURCE_C})
99101
COMMENT "Regeneration type support plugin from ${idl}")
100102

101103
add_custom_command(OUTPUT ${TAO_IDL_GEN_CPP_SND_STG} ${TAO_IDL_GEN_H_SCD_STG}
102-
COMMAND ${TAO_IDL} -Cw -Sa -St -o ${IDL_GEN_ROOT}/. -I${CMAKE_CURRENT_SOURCE_DIR}/.. -I${DDS_ROOT}/../../include/tao -I${DDS_ROOT}/../../include/ ${IDL_GEN_ROOT}/${basename}TypeSupport.idl
104+
COMMAND ${TAO_IDL} -Cw -Sa -St -o ${IDL_GEN_ROOT}/. -I${CMAKE_CURRENT_SOURCE_DIR}/..
105+
-I${DDS_ROOT}/../../include/tao -I${DDS_ROOT}/../../include/ ${IDL_GEN_ROOT}/${basename}TypeSupport.idl
103106
DEPENDS ${IDL_GEN_ROOT}/${basename}TypeSupport.idl
104107
COMMENT "Regeneration type support plugin from ${idl}")
105108

0 commit comments

Comments
 (0)