Skip to content

appsec: pass PCRE2 includes to xtest tracer build #4088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cataphract merged 2 commits into from
Aug 7, 2026
+10 −1
Merged

appsec: pass PCRE2 includes to xtest tracer build #4088

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b551d7
appsec: pass PCRE2 includes to xtest tracer build
cataphract Jul 30, 2026
4df284a
switch to EXTRA_INCLUDES
cataphract Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion appsec/cmake/run_tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@ if(DD_APPSEC_DDTRACE_ALT)
set(DD_APPSEC_TRACER_EXT_FILE $<TARGET_FILE:ddtrace>)
else()
get_filename_component(DD_APPSEC_TRACER_EXT_FILE "${CMAKE_SOURCE_DIR}/../tmp/build_extension/modules/ddtrace.so" REALPATH)
get_target_property(_DD_APPSEC_PCRE2_INCLUDE_DIRS
PCRE2::pcre2 INTERFACE_INCLUDE_DIRECTORIES)
if(_DD_APPSEC_PCRE2_INCLUDE_DIRS)
list(TRANSFORM _DD_APPSEC_PCRE2_INCLUDE_DIRS PREPEND "-I")
list(JOIN _DD_APPSEC_PCRE2_INCLUDE_DIRS " "
_DD_APPSEC_PCRE2_CPPFLAGS)
set(_DD_APPSEC_DDTRACE_MAKE_OPTIONS
"EXTRA_INCLUDES=${_DD_APPSEC_PCRE2_CPPFLAGS}")
endif()
add_custom_target(ddtrace
COMMAND ${CMAKE_COMMAND} -E env "PATH=${PhpConfig_ROOT_DIR}/bin:$ENV{PATH}" PHPRC=
make "${DD_APPSEC_TRACER_EXT_FILE}"
make ${_DD_APPSEC_DDTRACE_MAKE_OPTIONS} "${DD_APPSEC_TRACER_EXT_FILE}"
BYPRODUCTS ${DD_APPSEC_TRACER_EXT_FILE}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../)
endif()
Expand Down
Loading