Skip to content

Commit 8af344c

Browse files
anrivoalrzr
authored andcommitted
libs2: SWPROT-9264: Store ZW_classcmd.h in a generated subdirectory under ThirdParty directory (SiliconLabsSoftware#51)
libS2 now depends on two pathes from Zwave Stack : - ZWAVE_INCLUDE_DIR for all API include files - ZWAVE_CLASSCMD_DIR for ZW_classcmd.h file (cherry picked from commit 085d0c280bf0e187327f6c3e9542693eb097f54b) Relate-to: SiliconLabsSoftware#50 Forwarded: SiliconLabsSoftware#51 Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
1 parent b6f2313 commit 8af344c

File tree

1 file changed

+8
-3
lines changed
  • applications/zpc/components/zwave/zwave_transports/s2/libs/zw-libs2

1 file changed

+8
-3
lines changed

applications/zpc/components/zwave/zwave_transports/s2/libs/zw-libs2/CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,14 @@ if("${PROJECT_NAME}" STREQUAL "")
2020
endif()
2121

2222
find_path(
23-
ZWAVE_INCLUDE_DIR ZW_classcmd.h
23+
${ZWAVE_CLASSCMD_DIR} ZW_classcmd.h
2424
HINTS ENV ZWLIBROOT ${PROJECT_SOURCE_DIR}/..
25-
${PROJECT_SOURCE_DIR}/../../ZWave/API
25+
${PROJECT_SOURCE_DIR}/../../ThirdParty/generated/
26+
PATH_SUFFIXES include)
27+
find_path(
28+
${ZWAVE_INCLUDE_DIR} ZW.h
29+
HINTS ENV ZWLIBROOT ${PROJECT_SOURCE_DIR}/..
30+
${PROJECT_SOURCE_DIR}/../../ZWave/API/
2631
PATH_SUFFIXES include)
2732
SET(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --verbose --errors-for-leak-kinds=all --show-leak-kinds=all --leak-check=full --error-exitcode=1 --track-origins=yes")
2833
include(CTest)
@@ -40,7 +45,7 @@ set(CROSS_SYSTEM_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
4045
# Setting -DOPTIONAL_SYSTEM_INCLUDE=<optional_include_path> allows to specify
4146
# addional include path(s) when building libs2.
4247
include_directories(include ${ZWAVE_INCLUDE_DIR} ${CROSS_SYSTEM_INCLUDE}
43-
${OPTIONAL_SYSTEM_INCLUDE})
48+
${OPTIONAL_SYSTEM_INCLUDE} ${ZWAVE_CLASSCMD_DIR})
4449

4550
if("${CMAKE_PROJECT_NAME}" STREQUAL "SDK")
4651
set(SKIP_TESTING true)

0 commit comments

Comments
 (0)