From 40f7332b9ea36e0b8c69003974080325db232cc5 Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Thu, 17 Mar 2022 15:36:49 -0500 Subject: [PATCH] Address cmake linter problems Signed-off-by: Jorge Perez --- performance_test/src/idlgen/opendds/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/performance_test/src/idlgen/opendds/CMakeLists.txt b/performance_test/src/idlgen/opendds/CMakeLists.txt index c7b1ff2d..bfa42642 100644 --- a/performance_test/src/idlgen/opendds/CMakeLists.txt +++ b/performance_test/src/idlgen/opendds/CMakeLists.txt @@ -19,8 +19,10 @@ set(ACE_ROOT ${DDS_ROOT}/../ace) set(MPC_ROOT ${DDS_ROOT}/MPC) set(TAO_ROOT ${DDS_ROOT}/../tao) -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) -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) +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) +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) set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) set(IDL_SOURCE_C @@ -99,7 +101,8 @@ foreach(idl ${IDL_SOURCE_C}) COMMENT "Regeneration type support plugin from ${idl}") add_custom_command(OUTPUT ${TAO_IDL_GEN_CPP_SND_STG} ${TAO_IDL_GEN_H_SCD_STG} - 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 + 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 DEPENDS ${IDL_GEN_ROOT}/${basename}TypeSupport.idl COMMENT "Regeneration type support plugin from ${idl}")