Skip to content

Commit 23823a8

Browse files
authored
Merge pull request #1171 from openziti/move-zet-target-manipulation
move setting ziti-edge-tunnel compile definitions (execinfo)
2 parents 50091bc + 06e22d7 commit 23823a8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,6 @@ target_compile_definitions(lwipcore
183183
PUBLIC MEMP_NUM_UDP_PCB=${UDP_MAX_CONNECTIONS}
184184
)
185185

186-
# if EXECINFO is present set a flag for later inclusion
187-
include(CheckIncludeFile)
188-
check_include_file("execinfo.h" HAVE_EXECINFO_H)
189-
if(HAVE_EXECINFO_H)
190-
target_compile_definitions(ziti-edge-tunnel PRIVATE $<$<BOOL:${HAVE_EXECINFO_H}>:HAVE_EXECINFO_H>)
191-
endif()
192-
193186
if (ZITI_TUNNEL_BUILD_TESTS)
194187
add_subdirectory(tests)
195188
add_subdirectory(lib/tests)

programs/ziti-edge-tunnel/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ target_compile_definitions(ziti-edge-tunnel
9393
PRIVATE ZITI_LOG_MODULE="ziti-edge-tunnel"
9494
)
9595

96+
# if EXECINFO is present set a flag for later inclusion
97+
include(CheckIncludeFile)
98+
check_include_file("execinfo.h" HAVE_EXECINFO_H)
99+
if(HAVE_EXECINFO_H)
100+
target_compile_definitions(ziti-edge-tunnel PRIVATE $<$<BOOL:${HAVE_EXECINFO_H}>:HAVE_EXECINFO_H>)
101+
endif()
102+
96103
target_link_libraries(ziti-edge-tunnel
97104
PUBLIC ziti ziti-tunnel-sdk-c ziti-tunnel-cbs-c
98105
PUBLIC ${tun_lib}

0 commit comments

Comments
 (0)