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 <gregory.shue@legrand.us>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

west.yml

@@ -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 <manifest_dir_from_topdir>
-#
-#     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
-

zephyr/manifests/zp/zephyr/west.yml

@@ -5,12 +5,23 @@
 
 # The west manifest file for upstream Zephyr Project's Zephyr repo.
 #
-# Usage:
+# NOTE: Requires west 0.8.0a1 or later (pip3 install west==0.8.0a1)
-# west init -m https://github.com/bacnet-stack/bacnet-stack
+#
-# west config manifest.path zephyr/manifests/zp/zephyr
+# Usage (from top of workspace):
-# west update
+#   west
+#     --zephyr-base zephyr
+#     init
+#       -m https://github.com/bacnet-stack/bacnet-stack
+#       --mr <desired repo branch>
+#       --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

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)
+get_filename_component(MY_PROJECT_NAME ${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})
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(${MY_PROJECT_BASENAME})
+project(${MY_PROJECT_NAME})
 
 target_sources(app PRIVATE src/main.c)

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/src/"
-    NAME)
+  BACNET_SRC_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+string(REGEX REPLACE
-    BACNET_FILE_SUBPATH
+  "/zephyr/tests/" "/test/"
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  BACNET_TEST_PATH
-
+  ${CMAKE_CURRENT_SOURCE_DIR})
-
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-# 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)
 
 
 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_SRC_PATH}.c
-    ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.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()

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/src/"
-    NAME)
+  BACNET_SRC_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+string(REGEX REPLACE
-    BACNET_FILE_SUBPATH
+  "/zephyr/tests/" "/test/"
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  BACNET_TEST_PATH
-
+  ${CMAKE_CURRENT_SOURCE_DIR})
-
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-# 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)
 
 
 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_SRC_PATH}.c
-    ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.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()

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/src/"
-    NAME)
+  BACNET_SRC_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+string(REGEX REPLACE
-    BACNET_FILE_SUBPATH
+  "/zephyr/tests/" "/test/"
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  BACNET_TEST_PATH
-
+  ${CMAKE_CURRENT_SOURCE_DIR})
-
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-# 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)
 
 
 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_SRC_PATH}.c
-    ${BACNET_BASE}/test/${BACNET_FILE_SUBPATH}/src/main.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()

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )

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 
+string(REGEX REPLACE
-    "/zephyr/tests[a-zA-Z_/-]*$" ""
+  "/zephyr/tests/[a-zA-Z_/-]*$" ""
-    BACNET_BASE
+  BACNET_BASE
-    ${CMAKE_CURRENT_SOURCE_DIR})
+  ${CMAKE_CURRENT_SOURCE_DIR})
-get_filename_component(BACNET_FILE_BASENAME
+string(REGEX REPLACE
-    ${BACNET_BASE}
+  "/zephyr/tests/" "/test/"
-    NAME)
+  BACNET_TEST_PATH
-string(REGEX REPLACE 
+  ${CMAKE_CURRENT_SOURCE_DIR})
-    "^[a-zA-Z_/-]*/zephyr/tests/" ""
+get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
-    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)
 
-
 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
+  )