Skip to content

Commit

Permalink
Try fixing comm_type options.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakio815 committed Jan 29, 2025
1 parent 421c4f2 commit 34cd096
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
16 changes: 7 additions & 9 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,13 @@ target_link_libraries(reactor-c PUBLIC lf::platform-api)
target_link_libraries(reactor-c PRIVATE lf::platform-impl)

if(DEFINED FEDERATED)
option(COMM_TYPE "Communication type between RTI and federate(s)." ON)
IF(COMM_TYPE MATCHES ON)
set(COMM_TYPE TCP)
ENDIF()

include(${LF_ROOT}/network/api/CMakeLists.txt)
include(${LF_ROOT}/network/impl/CMakeLists.txt)
target_link_libraries(reactor-c PUBLIC lf::network-api)
target_link_libraries(reactor-c PRIVATE lf::network-impl)
if(NOT DEFINED COMM_TYPE)
set(COMM_TYPE TCP)
endif()
include(${LF_ROOT}/network/api/CMakeLists.txt)
include(${LF_ROOT}/network/impl/CMakeLists.txt)
target_link_libraries(reactor-c PUBLIC lf::network-api)
target_link_libraries(reactor-c PRIVATE lf::network-impl)
endif()

target_include_directories(reactor-c PUBLIC ../include)
Expand Down
2 changes: 1 addition & 1 deletion core/federated/RTI/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if (NOT DEFINED LOG_LEVEL)
ENDIF(NOT DEFINED LOG_LEVEL)

if(NOT DEFINED COMM_TYPE)
set(COMM_TYPE "TCP")
set(COMM_TYPE TCP)
endif()

IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
Expand Down

0 comments on commit 34cd096

Please sign in to comment.