Skip to content

Commit 194efce

Browse files
authored
Merge pull request #4088 from DataDog/glopes/tracer-build-macos
appsec: pass PCRE2 includes to xtest tracer build
2 parents 5406609 + 4df284a commit 194efce

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

appsec/cmake/run_tests.cmake

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@ if(DD_APPSEC_DDTRACE_ALT)
22
set(DD_APPSEC_TRACER_EXT_FILE $<TARGET_FILE:ddtrace>)
33
else()
44
get_filename_component(DD_APPSEC_TRACER_EXT_FILE "${CMAKE_SOURCE_DIR}/../tmp/build_extension/modules/ddtrace.so" REALPATH)
5+
get_target_property(_DD_APPSEC_PCRE2_INCLUDE_DIRS
6+
PCRE2::pcre2 INTERFACE_INCLUDE_DIRECTORIES)
7+
if(_DD_APPSEC_PCRE2_INCLUDE_DIRS)
8+
list(TRANSFORM _DD_APPSEC_PCRE2_INCLUDE_DIRS PREPEND "-I")
9+
list(JOIN _DD_APPSEC_PCRE2_INCLUDE_DIRS " "
10+
_DD_APPSEC_PCRE2_CPPFLAGS)
11+
set(_DD_APPSEC_DDTRACE_MAKE_OPTIONS
12+
"EXTRA_INCLUDES=${_DD_APPSEC_PCRE2_CPPFLAGS}")
13+
endif()
514
add_custom_target(ddtrace
615
COMMAND ${CMAKE_COMMAND} -E env "PATH=${PhpConfig_ROOT_DIR}/bin:$ENV{PATH}" PHPRC=
7-
make "${DD_APPSEC_TRACER_EXT_FILE}"
16+
make ${_DD_APPSEC_DDTRACE_MAKE_OPTIONS} "${DD_APPSEC_TRACER_EXT_FILE}"
817
BYPRODUCTS ${DD_APPSEC_TRACER_EXT_FILE}
918
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../)
1019
endif()

0 commit comments

Comments
 (0)