From c1429ba7beb69dec46f0567aa99f1818e12adb17 Mon Sep 17 00:00:00 2001 From: Txinto Date: Thu, 13 Aug 2020 16:19:42 +0100 Subject: [PATCH] Fixing BACDL_ETHERNET compilation (#108) Co-authored-by: Txinto Vaz --- CMakeLists.txt | 12 +++++++----- src/bacnet/datalink/dlenv.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10c97f60..94abcb4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10 FATAL_ERROR) +cmake_minimum_required(VERSION 3.7 FATAL_ERROR) project( bacnet-stack @@ -563,11 +563,13 @@ if(BACNET_STACK_BUILD_APPS) # apps/ptransfer/s_ptransfer.c) # target_link_libraries(ptransfer PRIVATE ${PROJECT_NAME}) - add_executable(readbdt apps/readbdt/main.c) - target_link_libraries(readbdt PRIVATE ${PROJECT_NAME}) + if(NOT BACDL_ETHERNET) + add_executable(readbdt apps/readbdt/main.c) + target_link_libraries(readbdt PRIVATE ${PROJECT_NAME}) - add_executable(readfdt apps/readfdt/main.c) - target_link_libraries(readfdt PRIVATE ${PROJECT_NAME}) + add_executable(readfdt apps/readfdt/main.c) + target_link_libraries(readfdt PRIVATE ${PROJECT_NAME}) + endif() add_executable(readfile apps/readfile/main.c) target_link_libraries(readfile PRIVATE ${PROJECT_NAME}) diff --git a/src/bacnet/datalink/dlenv.c b/src/bacnet/datalink/dlenv.c index 9c890e40..fb5fe74a 100644 --- a/src/bacnet/datalink/dlenv.c +++ b/src/bacnet/datalink/dlenv.c @@ -321,7 +321,6 @@ static void dlenv_network_port_init(void) since they are already set */ Network_Port_Changes_Pending_Set(instance, false); } -#endif #else /** * Datalink network port object settings @@ -331,6 +330,7 @@ static void dlenv_network_port_init(void) /* do nothing */ } #endif +#endif /** Datalink maintenance timer * @ingroup DataLink