Skip to content

Commit 82ebe22

Browse files
committed
Move check modules to extensions, SAPIs and Zend Engine
Moved modules are doing checks related to specific scope - extension, SAPI, or Zend Engine. Some checks are also moved to ext/standard and some to global configure step.
1 parent 47cbd66 commit 82ebe22

29 files changed

+40
-40
lines changed

cmake/Zend/CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -459,27 +459,30 @@ add_feature_info(
459459
)
460460

461461
# Check Zend max execution timers.
462-
include(Zend/MaxExecutionTimers)
462+
include(cmake/MaxExecutionTimers.cmake)
463463
if(TARGET Zend::MaxExecutionTimers)
464464
target_link_libraries(zend PRIVATE Zend::MaxExecutionTimers)
465465
endif()
466466

467467
# Check if dlsym() needs underscore.
468-
include(Zend/CheckDlsym)
468+
include(cmake/CheckDlsym.cmake)
469469

470470
# Check MM alignment.
471-
include(Zend/CheckMMAlignment)
471+
include(cmake/CheckMMAlignment.cmake)
472472

473473
# Check for global register variables.
474474
if(ZEND_GLOBAL_REGISTER_VARIABLES)
475-
include(Zend/CheckGlobalRegisterVariables)
475+
include(cmake/CheckGlobalRegisterVariables.cmake)
476476
endif()
477477

478478
# Check if stack grows downward.
479-
include(Zend/CheckStackLimit)
479+
include(cmake/CheckStackLimit.cmake)
480480

481481
# Check float precision.
482-
include(Zend/CheckFloatPrecision)
482+
include(cmake/CheckFloatPrecision.cmake)
483+
484+
# Check for strerror_r, and if its a POSIX-compatible or a GNU-specific version.
485+
include(cmake/CheckStrerrorR.cmake)
483486

484487
################################################################################
485488
# Generate lexers and parsers.
@@ -589,7 +592,7 @@ endif()
589592
# Configure fibers.
590593
################################################################################
591594

592-
include(Zend/Fibers)
595+
include(cmake/Fibers.cmake)
593596
if(TARGET Zend::Fibers)
594597
target_link_libraries(zend PRIVATE Zend::Fibers)
595598
endif()
File renamed without changes.

cmake/Zend/zend_config.cmake.h.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
/* Define to 1 if you have the 'sigsetjmp' function. */
6060
#cmakedefine HAVE_SIGSETJMP 1
6161

62+
/* Define if you have 'strerror_r'. */
63+
#cmakedefine HAVE_STRERROR_R 1
64+
65+
/* Define to 1 if strerror_r returns char *. */
66+
#cmakedefine STRERROR_R_CHAR_P 1
67+
6268
/* Define to 1 if checking the stack limit is supported. */
6369
#cmakedefine ZEND_CHECK_STACK_LIMIT 1
6470

0 commit comments

Comments
 (0)