Skip to content

Commit 1a233d9

Browse files
committed
Refactor ext/opcache/cmake/CheckSHM.cmake
- Cache variable names synced. - Added Midipix target also to PHP-8.3 branch to have branches synced. - Synced extension specific module style, docs etc.
1 parent 3e374a1 commit 1a233d9

File tree

3 files changed

+251
-231
lines changed

3 files changed

+251
-231
lines changed

cmake/cmake/toolchains/template.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,14 @@ set(PHP_ICONV_ERRNO_WORKS_EXITCODE 0)
101101
# ext/opcache
102102
################################################################################
103103

104-
# Set the exit code of SysV IPC shared memory check in opcache extension.
105-
set(HAVE_SHM_IPC_EXITCODE 0)
104+
# Set the exit code of SysV IPC shared memory check.
105+
set(PHP_EXT_OPCACHE_HAS_SHM_IPC_EXITCODE 0)
106106

107-
# Set the exit code of the mmap() using MAP_ANON shared memory check in opcache
108-
# extension.
109-
set(HAVE_SHM_MMAP_ANON_EXITCODE 0)
107+
# Set the exit code of the mmap() using MAP_ANON shared memory check.
108+
set(PHP_EXT_OPCACHE_HAS_SHM_MMAP_ANON_EXITCODE 0)
110109

111-
# Set the exit code of the shm_open() shared memory check in opcache extension.
112-
set(HAVE_SHM_MMAP_POSIX_EXITCODE 0)
110+
# Set the exit code of the shm_open() shared memory check.
111+
set(PHP_EXT_OPCACHE_HAS_SHM_MMAP_POSIX_EXITCODE 0)
113112

114113
################################################################################
115114
# ext/pcre

cmake/ext/opcache/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,5 @@ check_symbol_exists(mprotect sys/mman.h HAVE_MPROTECT)
303303

304304
# Check for shared memory support.
305305
include(cmake/CheckSHM.cmake)
306-
if(TARGET PHP::CheckSHMLibrary)
307-
target_link_libraries(php_ext_opcache PRIVATE PHP::CheckSHMLibrary)
308-
endif()
309306

310307
configure_file(cmake/config.h.in config.h)

0 commit comments

Comments
 (0)