From 5c2f198fd8efb5fc17bba0df4a10e3b824a3fc7f Mon Sep 17 00:00:00 2001 From: Greg Shue <32416235+gregshue@users.noreply.github.com> Date: Thu, 17 Sep 2020 07:58:06 -0700 Subject: [PATCH] Issue 121 zephyr module cleanup west 0 8 0a1 (#122) * Rm top-level west.yml; Cleanup manifests; Fix unit testing * Cleanup sample * Cleanup test CMakeLists Co-authored-by: Gregory Shue --- test/bacnet/abort/CMakeLists.txt | 12 ++++- test/bacnet/alarm_ack/CMakeLists.txt | 12 ++++- test/bacnet/arf/CMakeLists.txt | 12 ++++- test/bacnet/awf/CMakeLists.txt | 12 ++++- test/bacnet/bacapp/CMakeLists.txt | 12 ++++- test/bacnet/bacdcode/CMakeLists.txt | 12 ++++- test/bacnet/bacdevobjpropref/CMakeLists.txt | 12 ++++- test/bacnet/bacerror/CMakeLists.txt | 12 ++++- test/bacnet/bacint/CMakeLists.txt | 12 ++++- test/bacnet/bacpropstates/CMakeLists.txt | 12 ++++- test/bacnet/bacreal/CMakeLists.txt | 12 ++++- test/bacnet/bacstr/CMakeLists.txt | 12 ++++- .../basic/binding/address/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/acc/CMakeLists.txt | 12 ++++- .../object/access_credential/CMakeLists.txt | 12 ++++- .../basic/object/access_door/CMakeLists.txt | 12 ++++- .../basic/object/access_point/CMakeLists.txt | 12 ++++- .../basic/object/access_rights/CMakeLists.txt | 12 ++++- .../basic/object/access_user/CMakeLists.txt | 12 ++++- .../basic/object/access_zone/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/ai/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/ao/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/av/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/bi/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/bo/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/bv/CMakeLists.txt | 12 ++++- .../basic/object/command/CMakeLists.txt | 12 ++++- .../credential_data_input/CMakeLists.txt | 12 ++++- .../bacnet/basic/object/device/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/lc/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/lo/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/lsp/CMakeLists.txt | 12 ++++- .../basic/object/ms-input/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/mso/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/msv/CMakeLists.txt | 12 ++++- .../basic/object/netport/CMakeLists.txt | 12 ++++- .../basic/object/objects/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/osv/CMakeLists.txt | 12 ++++- test/bacnet/basic/object/piv/CMakeLists.txt | 12 ++++- .../basic/object/schedule/CMakeLists.txt | 12 ++++- test/bacnet/basic/sys/fifo/CMakeLists.txt | 12 ++++- test/bacnet/basic/sys/filename/CMakeLists.txt | 12 ++++- test/bacnet/basic/sys/key/CMakeLists.txt | 12 ++++- test/bacnet/basic/sys/keylist/CMakeLists.txt | 12 ++++- test/bacnet/basic/sys/ringbuf/CMakeLists.txt | 12 ++++- test/bacnet/basic/sys/sbuf/CMakeLists.txt | 12 ++++- test/bacnet/cov/CMakeLists.txt | 12 ++++- test/bacnet/datalink/bvlc/CMakeLists.txt | 12 ++++- test/bacnet/datalink/crc/CMakeLists.txt | 12 ++++- test/bacnet/datetime/CMakeLists.txt | 12 ++++- test/bacnet/dcc/CMakeLists.txt | 12 ++++- test/bacnet/event/CMakeLists.txt | 12 ++++- test/bacnet/getevent/CMakeLists.txt | 12 ++++- test/bacnet/iam/CMakeLists.txt | 12 ++++- test/bacnet/ihave/CMakeLists.txt | 12 ++++- test/bacnet/indtext/CMakeLists.txt | 12 ++++- test/bacnet/lighting/CMakeLists.txt | 12 ++++- test/bacnet/lso/CMakeLists.txt | 12 ++++- test/bacnet/memcopy/CMakeLists.txt | 12 ++++- test/bacnet/npdu/CMakeLists.txt | 12 ++++- test/bacnet/property/CMakeLists.txt | 12 ++++- test/bacnet/ptransfer/CMakeLists.txt | 12 ++++- test/bacnet/rd/CMakeLists.txt | 12 ++++- test/bacnet/reject/CMakeLists.txt | 12 ++++- test/bacnet/rp/CMakeLists.txt | 12 ++++- test/bacnet/rpm/CMakeLists.txt | 12 ++++- test/bacnet/timestamp/CMakeLists.txt | 12 ++++- test/bacnet/timesync/CMakeLists.txt | 12 ++++- test/bacnet/whohas/CMakeLists.txt | 12 ++++- test/bacnet/whois/CMakeLists.txt | 12 ++++- test/bacnet/wp/CMakeLists.txt | 12 ++++- west.yml | 25 ---------- zephyr/manifests/zp/zephyr/west.yml | 21 ++++++-- .../samples/hello_bacnet_stack/CMakeLists.txt | 19 +------ zephyr/tests/bacnet/abort/CMakeLists.txt | 49 +++++++++---------- zephyr/tests/bacnet/alarm_ack/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/arf/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/awf/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/bacapp/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/bacdcode/CMakeLists.txt | 33 +++++-------- .../bacnet/bacdevobjpropref/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/bacerror/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/bacint/CMakeLists.txt | 49 +++++++++---------- .../tests/bacnet/bacpropstates/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/bacreal/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/bacstr/CMakeLists.txt | 49 +++++++++---------- .../basic/binding/address/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/acc/CMakeLists.txt | 33 +++++-------- .../object/access_credential/CMakeLists.txt | 33 +++++-------- .../basic/object/access_door/CMakeLists.txt | 33 +++++-------- .../basic/object/access_point/CMakeLists.txt | 33 +++++-------- .../basic/object/access_rights/CMakeLists.txt | 33 +++++-------- .../basic/object/access_user/CMakeLists.txt | 33 +++++-------- .../basic/object/access_zone/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/ai/CMakeLists.txt | 35 +++++-------- .../bacnet/basic/object/ao/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/av/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/bi/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/bo/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/bv/CMakeLists.txt | 33 +++++-------- .../basic/object/command/CMakeLists.txt | 33 +++++-------- .../credential_data_input/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/device/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/lc/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/lo/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/lsp/CMakeLists.txt | 33 +++++-------- .../basic/object/ms-input/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/mso/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/msv/CMakeLists.txt | 33 +++++-------- .../basic/object/netport/CMakeLists.txt | 33 +++++-------- .../basic/object/objects/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/osv/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/object/piv/CMakeLists.txt | 33 +++++-------- .../basic/object/schedule/CMakeLists.txt | 33 +++++-------- .../bacnet/basic/sys/fifo/CMakeLists.txt | 49 +++++++++---------- .../bacnet/basic/sys/filename/CMakeLists.txt | 49 +++++++++---------- .../tests/bacnet/basic/sys/key/CMakeLists.txt | 49 +++++++++---------- .../bacnet/basic/sys/keylist/CMakeLists.txt | 49 +++++++++---------- .../bacnet/basic/sys/ringbuf/CMakeLists.txt | 49 +++++++++---------- .../bacnet/basic/sys/sbuf/CMakeLists.txt | 49 +++++++++---------- zephyr/tests/bacnet/cov/CMakeLists.txt | 33 +++++-------- .../tests/bacnet/datalink/bvlc/CMakeLists.txt | 33 +++++-------- .../tests/bacnet/datalink/crc/CMakeLists.txt | 49 +++++++++---------- zephyr/tests/bacnet/datetime/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/dcc/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/event/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/getevent/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/iam/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/ihave/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/indtext/CMakeLists.txt | 49 +++++++++---------- zephyr/tests/bacnet/lighting/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/lso/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/memcopy/CMakeLists.txt | 49 +++++++++---------- zephyr/tests/bacnet/npdu/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/property/CMakeLists.txt | 35 +++++-------- zephyr/tests/bacnet/ptransfer/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/rd/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/reject/CMakeLists.txt | 49 +++++++++---------- zephyr/tests/bacnet/rp/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/rpm/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/timestamp/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/timesync/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/whohas/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/whois/CMakeLists.txt | 33 +++++-------- zephyr/tests/bacnet/wp/CMakeLists.txt | 33 +++++-------- 145 files changed, 1711 insertions(+), 1761 deletions(-) delete mode 100644 west.yml diff --git a/test/bacnet/abort/CMakeLists.txt b/test/bacnet/abort/CMakeLists.txt index dfbf9ef9..38e29011 100644 --- a/test/bacnet/abort/CMakeLists.txt +++ b/test/bacnet/abort/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/alarm_ack/CMakeLists.txt b/test/bacnet/alarm_ack/CMakeLists.txt index 551b416d..a4d3d85e 100644 --- a/test/bacnet/alarm_ack/CMakeLists.txt +++ b/test/bacnet/alarm_ack/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/arf/CMakeLists.txt b/test/bacnet/arf/CMakeLists.txt index 472ff1fe..72dce27a 100644 --- a/test/bacnet/arf/CMakeLists.txt +++ b/test/bacnet/arf/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/awf/CMakeLists.txt b/test/bacnet/awf/CMakeLists.txt index d305950b..6d6a669d 100644 --- a/test/bacnet/awf/CMakeLists.txt +++ b/test/bacnet/awf/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacapp/CMakeLists.txt b/test/bacnet/bacapp/CMakeLists.txt index 89466e23..b69a1396 100644 --- a/test/bacnet/bacapp/CMakeLists.txt +++ b/test/bacnet/bacapp/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacdcode/CMakeLists.txt b/test/bacnet/bacdcode/CMakeLists.txt index 809bea67..6c2cf60a 100644 --- a/test/bacnet/bacdcode/CMakeLists.txt +++ b/test/bacnet/bacdcode/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacdevobjpropref/CMakeLists.txt b/test/bacnet/bacdevobjpropref/CMakeLists.txt index aedaf644..83613d97 100644 --- a/test/bacnet/bacdevobjpropref/CMakeLists.txt +++ b/test/bacnet/bacdevobjpropref/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacerror/CMakeLists.txt b/test/bacnet/bacerror/CMakeLists.txt index 30eff33e..7ea9fedc 100644 --- a/test/bacnet/bacerror/CMakeLists.txt +++ b/test/bacnet/bacerror/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacint/CMakeLists.txt b/test/bacnet/bacint/CMakeLists.txt index ffd4ed50..fa05091d 100644 --- a/test/bacnet/bacint/CMakeLists.txt +++ b/test/bacnet/bacint/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacpropstates/CMakeLists.txt b/test/bacnet/bacpropstates/CMakeLists.txt index 1bfdc7ea..da673a35 100644 --- a/test/bacnet/bacpropstates/CMakeLists.txt +++ b/test/bacnet/bacpropstates/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacreal/CMakeLists.txt b/test/bacnet/bacreal/CMakeLists.txt index 3aa5c125..992cc977 100644 --- a/test/bacnet/bacreal/CMakeLists.txt +++ b/test/bacnet/bacreal/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/bacstr/CMakeLists.txt b/test/bacnet/bacstr/CMakeLists.txt index 347b303a..4c8be6dc 100644 --- a/test/bacnet/bacstr/CMakeLists.txt +++ b/test/bacnet/bacstr/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/binding/address/CMakeLists.txt b/test/bacnet/basic/binding/address/CMakeLists.txt index 1b79c4a7..5eab762d 100644 --- a/test/bacnet/basic/binding/address/CMakeLists.txt +++ b/test/bacnet/basic/binding/address/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/acc/CMakeLists.txt b/test/bacnet/basic/object/acc/CMakeLists.txt index 4801252a..de197ac2 100644 --- a/test/bacnet/basic/object/acc/CMakeLists.txt +++ b/test/bacnet/basic/object/acc/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/access_credential/CMakeLists.txt b/test/bacnet/basic/object/access_credential/CMakeLists.txt index 7be69444..baf6b03c 100644 --- a/test/bacnet/basic/object/access_credential/CMakeLists.txt +++ b/test/bacnet/basic/object/access_credential/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/access_door/CMakeLists.txt b/test/bacnet/basic/object/access_door/CMakeLists.txt index 5cb31939..e2bcb6ee 100644 --- a/test/bacnet/basic/object/access_door/CMakeLists.txt +++ b/test/bacnet/basic/object/access_door/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/access_point/CMakeLists.txt b/test/bacnet/basic/object/access_point/CMakeLists.txt index 5b03d8fd..dee7d0d3 100644 --- a/test/bacnet/basic/object/access_point/CMakeLists.txt +++ b/test/bacnet/basic/object/access_point/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/access_rights/CMakeLists.txt b/test/bacnet/basic/object/access_rights/CMakeLists.txt index b2ef87c8..ab41c1cd 100644 --- a/test/bacnet/basic/object/access_rights/CMakeLists.txt +++ b/test/bacnet/basic/object/access_rights/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/access_user/CMakeLists.txt b/test/bacnet/basic/object/access_user/CMakeLists.txt index a0602bd3..86b06677 100644 --- a/test/bacnet/basic/object/access_user/CMakeLists.txt +++ b/test/bacnet/basic/object/access_user/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/access_zone/CMakeLists.txt b/test/bacnet/basic/object/access_zone/CMakeLists.txt index 685a48c4..f0d1996d 100644 --- a/test/bacnet/basic/object/access_zone/CMakeLists.txt +++ b/test/bacnet/basic/object/access_zone/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/ai/CMakeLists.txt b/test/bacnet/basic/object/ai/CMakeLists.txt index 5e691cd8..e9fc0d07 100644 --- a/test/bacnet/basic/object/ai/CMakeLists.txt +++ b/test/bacnet/basic/object/ai/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/ao/CMakeLists.txt b/test/bacnet/basic/object/ao/CMakeLists.txt index cd83ca41..e47d67c8 100644 --- a/test/bacnet/basic/object/ao/CMakeLists.txt +++ b/test/bacnet/basic/object/ao/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/av/CMakeLists.txt b/test/bacnet/basic/object/av/CMakeLists.txt index 00ff07e0..43a37668 100644 --- a/test/bacnet/basic/object/av/CMakeLists.txt +++ b/test/bacnet/basic/object/av/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/bi/CMakeLists.txt b/test/bacnet/basic/object/bi/CMakeLists.txt index d2e296f6..6a5f6afa 100644 --- a/test/bacnet/basic/object/bi/CMakeLists.txt +++ b/test/bacnet/basic/object/bi/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/bo/CMakeLists.txt b/test/bacnet/basic/object/bo/CMakeLists.txt index 35ad7f2e..54ab3572 100644 --- a/test/bacnet/basic/object/bo/CMakeLists.txt +++ b/test/bacnet/basic/object/bo/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/bv/CMakeLists.txt b/test/bacnet/basic/object/bv/CMakeLists.txt index 662f1d76..fa679e8e 100644 --- a/test/bacnet/basic/object/bv/CMakeLists.txt +++ b/test/bacnet/basic/object/bv/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/command/CMakeLists.txt b/test/bacnet/basic/object/command/CMakeLists.txt index dae19db5..78afc6aa 100644 --- a/test/bacnet/basic/object/command/CMakeLists.txt +++ b/test/bacnet/basic/object/command/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/credential_data_input/CMakeLists.txt b/test/bacnet/basic/object/credential_data_input/CMakeLists.txt index d87af810..fb2df9d0 100644 --- a/test/bacnet/basic/object/credential_data_input/CMakeLists.txt +++ b/test/bacnet/basic/object/credential_data_input/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/device/CMakeLists.txt b/test/bacnet/basic/object/device/CMakeLists.txt index 3e9b5f32..a9d544af 100644 --- a/test/bacnet/basic/object/device/CMakeLists.txt +++ b/test/bacnet/basic/object/device/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/lc/CMakeLists.txt b/test/bacnet/basic/object/lc/CMakeLists.txt index 7d9f8218..ab34d3d0 100644 --- a/test/bacnet/basic/object/lc/CMakeLists.txt +++ b/test/bacnet/basic/object/lc/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/lo/CMakeLists.txt b/test/bacnet/basic/object/lo/CMakeLists.txt index 3c9991bc..35747bce 100644 --- a/test/bacnet/basic/object/lo/CMakeLists.txt +++ b/test/bacnet/basic/object/lo/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/lsp/CMakeLists.txt b/test/bacnet/basic/object/lsp/CMakeLists.txt index 30f0df6d..5c4b5caa 100644 --- a/test/bacnet/basic/object/lsp/CMakeLists.txt +++ b/test/bacnet/basic/object/lsp/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/ms-input/CMakeLists.txt b/test/bacnet/basic/object/ms-input/CMakeLists.txt index 9d685857..758d0e19 100644 --- a/test/bacnet/basic/object/ms-input/CMakeLists.txt +++ b/test/bacnet/basic/object/ms-input/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/mso/CMakeLists.txt b/test/bacnet/basic/object/mso/CMakeLists.txt index e2e7963e..30a24a93 100644 --- a/test/bacnet/basic/object/mso/CMakeLists.txt +++ b/test/bacnet/basic/object/mso/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/msv/CMakeLists.txt b/test/bacnet/basic/object/msv/CMakeLists.txt index 953e965a..1c7c5595 100644 --- a/test/bacnet/basic/object/msv/CMakeLists.txt +++ b/test/bacnet/basic/object/msv/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/netport/CMakeLists.txt b/test/bacnet/basic/object/netport/CMakeLists.txt index 3bb707ec..5873e0a9 100644 --- a/test/bacnet/basic/object/netport/CMakeLists.txt +++ b/test/bacnet/basic/object/netport/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/objects/CMakeLists.txt b/test/bacnet/basic/object/objects/CMakeLists.txt index 355d1c19..afa1a420 100644 --- a/test/bacnet/basic/object/objects/CMakeLists.txt +++ b/test/bacnet/basic/object/objects/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/osv/CMakeLists.txt b/test/bacnet/basic/object/osv/CMakeLists.txt index 24593231..9a95e9e2 100644 --- a/test/bacnet/basic/object/osv/CMakeLists.txt +++ b/test/bacnet/basic/object/osv/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/piv/CMakeLists.txt b/test/bacnet/basic/object/piv/CMakeLists.txt index 032e0b39..59224ccd 100644 --- a/test/bacnet/basic/object/piv/CMakeLists.txt +++ b/test/bacnet/basic/object/piv/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/object/schedule/CMakeLists.txt b/test/bacnet/basic/object/schedule/CMakeLists.txt index 62278e9a..5698787a 100644 --- a/test/bacnet/basic/object/schedule/CMakeLists.txt +++ b/test/bacnet/basic/object/schedule/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/sys/fifo/CMakeLists.txt b/test/bacnet/basic/sys/fifo/CMakeLists.txt index 834db1e8..19df298e 100644 --- a/test/bacnet/basic/sys/fifo/CMakeLists.txt +++ b/test/bacnet/basic/sys/fifo/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/sys/filename/CMakeLists.txt b/test/bacnet/basic/sys/filename/CMakeLists.txt index 5358808e..d8b32d02 100644 --- a/test/bacnet/basic/sys/filename/CMakeLists.txt +++ b/test/bacnet/basic/sys/filename/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/sys/key/CMakeLists.txt b/test/bacnet/basic/sys/key/CMakeLists.txt index d20bb147..c180c5be 100644 --- a/test/bacnet/basic/sys/key/CMakeLists.txt +++ b/test/bacnet/basic/sys/key/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/sys/keylist/CMakeLists.txt b/test/bacnet/basic/sys/keylist/CMakeLists.txt index 1218e962..e2695572 100644 --- a/test/bacnet/basic/sys/keylist/CMakeLists.txt +++ b/test/bacnet/basic/sys/keylist/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/sys/ringbuf/CMakeLists.txt b/test/bacnet/basic/sys/ringbuf/CMakeLists.txt index 40d3f3c8..17422784 100644 --- a/test/bacnet/basic/sys/ringbuf/CMakeLists.txt +++ b/test/bacnet/basic/sys/ringbuf/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/basic/sys/sbuf/CMakeLists.txt b/test/bacnet/basic/sys/sbuf/CMakeLists.txt index 0d24d27f..adbc0aba 100644 --- a/test/bacnet/basic/sys/sbuf/CMakeLists.txt +++ b/test/bacnet/basic/sys/sbuf/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/cov/CMakeLists.txt b/test/bacnet/cov/CMakeLists.txt index 62d2af6b..57da666a 100644 --- a/test/bacnet/cov/CMakeLists.txt +++ b/test/bacnet/cov/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/datalink/bvlc/CMakeLists.txt b/test/bacnet/datalink/bvlc/CMakeLists.txt index 55ff6456..d16fc704 100644 --- a/test/bacnet/datalink/bvlc/CMakeLists.txt +++ b/test/bacnet/datalink/bvlc/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/datalink/crc/CMakeLists.txt b/test/bacnet/datalink/crc/CMakeLists.txt index 99daeac1..9b3be587 100644 --- a/test/bacnet/datalink/crc/CMakeLists.txt +++ b/test/bacnet/datalink/crc/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/datetime/CMakeLists.txt b/test/bacnet/datetime/CMakeLists.txt index 32f296cc..85f897c0 100644 --- a/test/bacnet/datetime/CMakeLists.txt +++ b/test/bacnet/datetime/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/dcc/CMakeLists.txt b/test/bacnet/dcc/CMakeLists.txt index c345f9e3..6a6dfb8d 100644 --- a/test/bacnet/dcc/CMakeLists.txt +++ b/test/bacnet/dcc/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/event/CMakeLists.txt b/test/bacnet/event/CMakeLists.txt index bab88a49..0b73fd82 100644 --- a/test/bacnet/event/CMakeLists.txt +++ b/test/bacnet/event/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/getevent/CMakeLists.txt b/test/bacnet/getevent/CMakeLists.txt index bab2a620..23010271 100644 --- a/test/bacnet/getevent/CMakeLists.txt +++ b/test/bacnet/getevent/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/iam/CMakeLists.txt b/test/bacnet/iam/CMakeLists.txt index 7a6441eb..85be3524 100644 --- a/test/bacnet/iam/CMakeLists.txt +++ b/test/bacnet/iam/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/ihave/CMakeLists.txt b/test/bacnet/ihave/CMakeLists.txt index f5142e51..5161d815 100644 --- a/test/bacnet/ihave/CMakeLists.txt +++ b/test/bacnet/ihave/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/indtext/CMakeLists.txt b/test/bacnet/indtext/CMakeLists.txt index a1043fd4..7a541f51 100644 --- a/test/bacnet/indtext/CMakeLists.txt +++ b/test/bacnet/indtext/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/lighting/CMakeLists.txt b/test/bacnet/lighting/CMakeLists.txt index a4dbfb19..b2645e44 100644 --- a/test/bacnet/lighting/CMakeLists.txt +++ b/test/bacnet/lighting/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/lso/CMakeLists.txt b/test/bacnet/lso/CMakeLists.txt index 4f7fdc6f..fc7b168e 100644 --- a/test/bacnet/lso/CMakeLists.txt +++ b/test/bacnet/lso/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/memcopy/CMakeLists.txt b/test/bacnet/memcopy/CMakeLists.txt index 00bc09ad..104e56d7 100644 --- a/test/bacnet/memcopy/CMakeLists.txt +++ b/test/bacnet/memcopy/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/npdu/CMakeLists.txt b/test/bacnet/npdu/CMakeLists.txt index d4148d46..149cabe2 100644 --- a/test/bacnet/npdu/CMakeLists.txt +++ b/test/bacnet/npdu/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/property/CMakeLists.txt b/test/bacnet/property/CMakeLists.txt index d0a66c3a..3938e68f 100644 --- a/test/bacnet/property/CMakeLists.txt +++ b/test/bacnet/property/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/ptransfer/CMakeLists.txt b/test/bacnet/ptransfer/CMakeLists.txt index e8b802ec..8cc5045b 100644 --- a/test/bacnet/ptransfer/CMakeLists.txt +++ b/test/bacnet/ptransfer/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/rd/CMakeLists.txt b/test/bacnet/rd/CMakeLists.txt index 60c1e62d..ed47a163 100644 --- a/test/bacnet/rd/CMakeLists.txt +++ b/test/bacnet/rd/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/reject/CMakeLists.txt b/test/bacnet/reject/CMakeLists.txt index fe726f25..729dfba2 100644 --- a/test/bacnet/reject/CMakeLists.txt +++ b/test/bacnet/reject/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/rp/CMakeLists.txt b/test/bacnet/rp/CMakeLists.txt index 0a5858d4..a4e1cf5e 100644 --- a/test/bacnet/rp/CMakeLists.txt +++ b/test/bacnet/rp/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/rpm/CMakeLists.txt b/test/bacnet/rpm/CMakeLists.txt index 479b4c7c..e0527422 100644 --- a/test/bacnet/rpm/CMakeLists.txt +++ b/test/bacnet/rpm/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/timestamp/CMakeLists.txt b/test/bacnet/timestamp/CMakeLists.txt index 685165a5..7eb14cdc 100644 --- a/test/bacnet/timestamp/CMakeLists.txt +++ b/test/bacnet/timestamp/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/timesync/CMakeLists.txt b/test/bacnet/timesync/CMakeLists.txt index 7cc53eb6..42a9017b 100644 --- a/test/bacnet/timesync/CMakeLists.txt +++ b/test/bacnet/timesync/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/whohas/CMakeLists.txt b/test/bacnet/whohas/CMakeLists.txt index e9a9b0c4..c182c97b 100644 --- a/test/bacnet/whohas/CMakeLists.txt +++ b/test/bacnet/whohas/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/whois/CMakeLists.txt b/test/bacnet/whois/CMakeLists.txt index 00bc6f4a..114ae5fa 100644 --- a/test/bacnet/whois/CMakeLists.txt +++ b/test/bacnet/whois/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/test/bacnet/wp/CMakeLists.txt b/test/bacnet/wp/CMakeLists.txt index a12a5696..063856fe 100644 --- a/test/bacnet/wp/CMakeLists.txt +++ b/test/bacnet/wp/CMakeLists.txt @@ -8,9 +8,17 @@ project(test_${basename} LANGUAGES C) -string(REGEX REPLACE "/bacnet/[a-zA-Z_/-]*$" "" TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/src" + SRC_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/test/bacnet/[a-zA-Z_/-]*$" + "/test" + TST_DIR + ${CMAKE_CURRENT_SOURCE_DIR}) set(ZTST_DIR "${TST_DIR}/ztest/src") -string(REGEX REPLACE "/test$" "/src" SRC_DIR ${TST_DIR}) add_compile_definitions( BIG_ENDIAN=0 diff --git a/west.yml b/west.yml deleted file mode 100644 index a4bee39f..00000000 --- a/west.yml +++ /dev/null @@ -1,25 +0,0 @@ -# The top-level west manifest file for upstream bacnet-stack. - -# This top-level west manifest file intentionally provides only the -# minimal configuration necessary for a successful 'west init', in -# expectation that multiple manifests will exist within one branch -# of this repository. Once 'west init' has completed, west may be -# configured to use alternate manfiests with the following command: -# -# west config manifest.path -# -# e.g. west config manifest.path bacnet-stack/zephyr/manifests/zp/zephyr - -# NOTE: Since the schema requires at least one project name, -# the mapping of this repository must be described as a project -# rather than under the 'self' key. - -manifest: - remotes: - - name: self - url-base: https://github.com/bacnet-stack - projects: - - name: bacnet-stack - remote: self - revision: master # The main branch of this repository - diff --git a/zephyr/manifests/zp/zephyr/west.yml b/zephyr/manifests/zp/zephyr/west.yml index fa7ce6b8..aee478f0 100644 --- a/zephyr/manifests/zp/zephyr/west.yml +++ b/zephyr/manifests/zp/zephyr/west.yml @@ -5,12 +5,23 @@ # The west manifest file for upstream Zephyr Project's Zephyr repo. # -# Usage: -# west init -m https://github.com/bacnet-stack/bacnet-stack -# west config manifest.path zephyr/manifests/zp/zephyr -# west update +# NOTE: Requires west 0.8.0a1 or later (pip3 install west==0.8.0a1) +# +# Usage (from top of workspace): +# west +# --zephyr-base zephyr +# init +# -m https://github.com/bacnet-stack/bacnet-stack +# --mr +# --mf zephyr/manifests/zp/zephyr/west.yml +# --zephyr-base zephyr +# $workspace +# cd $workspace +# west update +# source zephyr/zephyr-env.sh manifest: + version: 0.7 remotes: - name: zephyrproject-rtos url-base: https://github.com/zephyrproject-rtos @@ -20,3 +31,5 @@ manifest: revision: v2.3.0 # Latest integrated release import: true path: zephyr + self: + path: bacnet-stack diff --git a/zephyr/samples/hello_bacnet_stack/CMakeLists.txt b/zephyr/samples/hello_bacnet_stack/CMakeLists.txt index 675c93d1..574bf2d8 100644 --- a/zephyr/samples/hello_bacnet_stack/CMakeLists.txt +++ b/zephyr/samples/hello_bacnet_stack/CMakeLists.txt @@ -2,24 +2,9 @@ cmake_minimum_required(VERSION 3.13.1) -get_filename_component(MY_PROJECT_BASENAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) - -# Find the directory of the Zephyr module -string(REGEX REPLACE - "\/zephyr\/samples\/[a-zA-Z_\-\\\\/]*${MY_PROJECT_BASENAME}$" "" - MY_ZEPHYR_MODULE_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}) - -list(APPEND ZEPHYR_EXTRA_MODULES - ${MY_PROJECT_BASENAME} ${MY_ZEPHYR_MODULE_SOURCE_DIR} - ) - -# Add an absolute directory path to the CMake variable -# SYSCALL_INCLUDE_DIRS. This ensures that the syscall machinery will -# be able to find the module's syscalls. -#TODO: list(APPEND SYSCALL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(MY_PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(${MY_PROJECT_BASENAME}) +project(${MY_PROJECT_NAME}) target_sources(app PRIVATE src/main.c) diff --git a/zephyr/tests/bacnet/abort/CMakeLists.txt b/zephyr/tests/bacnet/abort/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/abort/CMakeLists.txt +++ b/zephyr/tests/bacnet/abort/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt b/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt index 2c97bb7c..809ef0fc 100644 --- a/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt +++ b/zephyr/tests/bacnet/alarm_ack/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/arf/CMakeLists.txt b/zephyr/tests/bacnet/arf/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/arf/CMakeLists.txt +++ b/zephyr/tests/bacnet/arf/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/awf/CMakeLists.txt b/zephyr/tests/bacnet/awf/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/awf/CMakeLists.txt +++ b/zephyr/tests/bacnet/awf/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacapp/CMakeLists.txt b/zephyr/tests/bacnet/bacapp/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/bacapp/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacapp/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacdcode/CMakeLists.txt b/zephyr/tests/bacnet/bacdcode/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/bacdcode/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacdcode/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt b/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacdevobjpropref/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacerror/CMakeLists.txt b/zephyr/tests/bacnet/bacerror/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/bacerror/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacerror/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacint/CMakeLists.txt b/zephyr/tests/bacnet/bacint/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/bacint/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacint/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt b/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacpropstates/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacreal/CMakeLists.txt b/zephyr/tests/bacnet/bacreal/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/bacreal/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacreal/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/bacstr/CMakeLists.txt b/zephyr/tests/bacnet/bacstr/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/bacstr/CMakeLists.txt +++ b/zephyr/tests/bacnet/bacstr/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt b/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/binding/address/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/access_zone/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt index db16f46f..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ai/CMakeLists.txt @@ -2,35 +2,24 @@ cmake_minimum_required(VERSION 3.13.1) -list(APPEND BACNET_INCLUDE ../modules/lib/bacnet/src) - # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ao/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/av/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bi/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bo/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/bv/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/device/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lc/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lo/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/lsp/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/ms-input/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/mso/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/msv/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/objects/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/osv/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/piv/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/fifo/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/filename/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/key/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/keylist/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/ringbuf/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt b/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/sys/sbuf/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/cov/CMakeLists.txt b/zephyr/tests/bacnet/cov/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/cov/CMakeLists.txt +++ b/zephyr/tests/bacnet/cov/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt b/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/bvlc/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt b/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt +++ b/zephyr/tests/bacnet/datalink/crc/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/datetime/CMakeLists.txt b/zephyr/tests/bacnet/datetime/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/datetime/CMakeLists.txt +++ b/zephyr/tests/bacnet/datetime/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/dcc/CMakeLists.txt b/zephyr/tests/bacnet/dcc/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/dcc/CMakeLists.txt +++ b/zephyr/tests/bacnet/dcc/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/event/CMakeLists.txt b/zephyr/tests/bacnet/event/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/event/CMakeLists.txt +++ b/zephyr/tests/bacnet/event/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/getevent/CMakeLists.txt b/zephyr/tests/bacnet/getevent/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/getevent/CMakeLists.txt +++ b/zephyr/tests/bacnet/getevent/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/iam/CMakeLists.txt b/zephyr/tests/bacnet/iam/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/iam/CMakeLists.txt +++ b/zephyr/tests/bacnet/iam/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/ihave/CMakeLists.txt b/zephyr/tests/bacnet/ihave/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/ihave/CMakeLists.txt +++ b/zephyr/tests/bacnet/ihave/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/indtext/CMakeLists.txt b/zephyr/tests/bacnet/indtext/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/indtext/CMakeLists.txt +++ b/zephyr/tests/bacnet/indtext/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/lighting/CMakeLists.txt b/zephyr/tests/bacnet/lighting/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/lighting/CMakeLists.txt +++ b/zephyr/tests/bacnet/lighting/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/lso/CMakeLists.txt b/zephyr/tests/bacnet/lso/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/lso/CMakeLists.txt +++ b/zephyr/tests/bacnet/lso/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/memcopy/CMakeLists.txt b/zephyr/tests/bacnet/memcopy/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/memcopy/CMakeLists.txt +++ b/zephyr/tests/bacnet/memcopy/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/npdu/CMakeLists.txt b/zephyr/tests/bacnet/npdu/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/npdu/CMakeLists.txt +++ b/zephyr/tests/bacnet/npdu/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/property/CMakeLists.txt b/zephyr/tests/bacnet/property/CMakeLists.txt index f964942d..809ef0fc 100644 --- a/zephyr/tests/bacnet/property/CMakeLists.txt +++ b/zephyr/tests/bacnet/property/CMakeLists.txt @@ -3,34 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) - -add_definitions(-DBACNET_PROPERTY_LISTS=1) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/ptransfer/CMakeLists.txt +++ b/zephyr/tests/bacnet/ptransfer/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/rd/CMakeLists.txt b/zephyr/tests/bacnet/rd/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/rd/CMakeLists.txt +++ b/zephyr/tests/bacnet/rd/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/reject/CMakeLists.txt b/zephyr/tests/bacnet/reject/CMakeLists.txt index a7ccd79d..7110583b 100644 --- a/zephyr/tests/bacnet/reject/CMakeLists.txt +++ b/zephyr/tests/bacnet/reject/CMakeLists.txt @@ -3,42 +3,37 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - - -# Update include path for this module -list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/src/" + BACNET_SRC_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) if(BOARD STREQUAL unit_testing) + file(RELATIVE_PATH BACNET_INCLUDE ${ZEPHYR_BASE} ${BACNET_BASE}/src) list(APPEND INCLUDE ${BACNET_INCLUDE}) list(APPEND SOURCES - ${BACNET_BASE}/src/${BACNET_FILE_SUBPATH}.c - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_SRC_PATH}.c + ${BACNET_TEST_PATH}/src/main.c + ) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) else() include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) - project(${BACNET_FILE_BASENAME}) + project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE ${BACNET_BASE}/src) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) endif() diff --git a/zephyr/tests/bacnet/rp/CMakeLists.txt b/zephyr/tests/bacnet/rp/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/rp/CMakeLists.txt +++ b/zephyr/tests/bacnet/rp/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/rpm/CMakeLists.txt b/zephyr/tests/bacnet/rpm/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/rpm/CMakeLists.txt +++ b/zephyr/tests/bacnet/rpm/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/timestamp/CMakeLists.txt b/zephyr/tests/bacnet/timestamp/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/timestamp/CMakeLists.txt +++ b/zephyr/tests/bacnet/timestamp/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/timesync/CMakeLists.txt b/zephyr/tests/bacnet/timesync/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/timesync/CMakeLists.txt +++ b/zephyr/tests/bacnet/timesync/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/whohas/CMakeLists.txt b/zephyr/tests/bacnet/whohas/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/whohas/CMakeLists.txt +++ b/zephyr/tests/bacnet/whohas/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/whois/CMakeLists.txt b/zephyr/tests/bacnet/whois/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/whois/CMakeLists.txt +++ b/zephyr/tests/bacnet/whois/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + ) diff --git a/zephyr/tests/bacnet/wp/CMakeLists.txt b/zephyr/tests/bacnet/wp/CMakeLists.txt index 3eaf3e6d..809ef0fc 100644 --- a/zephyr/tests/bacnet/wp/CMakeLists.txt +++ b/zephyr/tests/bacnet/wp/CMakeLists.txt @@ -3,32 +3,23 @@ cmake_minimum_required(VERSION 3.13.1) # Extract module path and names -string(REGEX REPLACE - "/zephyr/tests[a-zA-Z_/-]*$" "" - BACNET_BASE - ${CMAKE_CURRENT_SOURCE_DIR}) -get_filename_component(BACNET_FILE_BASENAME - ${BACNET_BASE} - NAME) -string(REGEX REPLACE - "^[a-zA-Z_/-]*/zephyr/tests/" "" - BACNET_FILE_SUBPATH - ${CMAKE_CURRENT_SOURCE_DIR}) - - -# Add this module to the Zephyr build line -list(APPEND ZEPHYR_EXTRA_MODULES - ${BACNET_BASE} - ) - +string(REGEX REPLACE + "/zephyr/tests/[a-zA-Z_/-]*$" "" + BACNET_BASE + ${CMAKE_CURRENT_SOURCE_DIR}) +string(REGEX REPLACE + "/zephyr/tests/" "/test/" + BACNET_TEST_PATH + ${CMAKE_CURRENT_SOURCE_DIR}) +get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) - include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE) -project(${BACNET_FILE_BASENAME}) +project(${BACNET_NAME}) target_include_directories(app PRIVATE ${BACNET_INCLUDE}) target_sources(app PRIVATE - ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.c) + ${BACNET_TEST_PATH}/src/main.c + )