Skip to content

Commit 6c648a1

Browse files
committed
Merge branch 'PHP-8.4'
2 parents db42883 + e21732d commit 6c648a1

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cmake/cmake/modules/PHP/ThreadSafety.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function(_php_thread_safety)
6464

6565
target_link_libraries(php_configuration INTERFACE Threads::Threads)
6666

67-
set(ZTS 1 PARENT_SCOPE)
67+
set(ZTS TRUE PARENT_SCOPE)
6868

6969
# Add ZTS compile definition. Some PHP headers might not have php_config.h
7070
# directly available. For example, some Zend headers.

cmake/ext/pdo_odbc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ if(TARGET ODBC::ODBC)
203203
if(EXISTS ${ODBC_INCLUDE_DIR}/${header})
204204
message(CHECK_PASS "found")
205205
set(haveSomeHeaders TRUE)
206-
set(${const} 1 PARENT_SCOPE)
206+
set(${const} TRUE PARENT_SCOPE)
207207
else()
208208
message(CHECK_FAIL "not found")
209209
endif()

cmake/main/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ if(PHP_DTRACE)
242242
target_link_libraries(php_main PRIVATE DTrace::DTrace)
243243
target_link_libraries(php INTERFACE php_dtrace)
244244

245-
set(HAVE_DTRACE 1 PARENT_SCOPE)
245+
set(HAVE_DTRACE TRUE PARENT_SCOPE)
246246

247247
message(CHECK_PASS "yes")
248248
else()
@@ -280,7 +280,7 @@ if(PHP_DMALLOC)
280280

281281
if(Dmalloc_FOUND)
282282
message(CHECK_PASS "yes")
283-
set(HAVE_DMALLOC 1 PARENT_SCOPE)
283+
set(HAVE_DMALLOC TRUE PARENT_SCOPE)
284284
else()
285285
message(CHECK_FAIL "no")
286286
endif()

0 commit comments

Comments
 (0)