Skip to content

Commit ad7bcee

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 479274e + d4a669a commit ad7bcee

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

cmake/ext/intl/CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,9 @@ set_package_properties(
199199
)
200200

201201
if(ICU_VERSION VERSION_GREATER_EQUAL 74)
202-
set_target_properties(
203-
php_ext_intl
204-
PROPERTIES
205-
CXX_STANDARD 17
206-
CXX_STANDARD_REQUIRED TRUE
207-
)
202+
target_compile_features(php_ext_intl PRIVATE cxx_std_17)
208203
else()
209-
set_target_properties(
210-
php_ext_intl
211-
PROPERTIES
212-
CXX_STANDARD 11
213-
CXX_STANDARD_REQUIRED TRUE
214-
)
204+
target_compile_features(php_ext_intl PRIVATE cxx_std_11)
215205
endif()
216206

217207
target_link_libraries(php_ext_intl PRIVATE ICU::io ICU::uc ICU::i18n)

cmake/ext/pdo_firebird/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,7 @@ target_sources(
6969
pdo_firebird.stub.php
7070
)
7171

72-
set_target_properties(
73-
php_ext_pdo_firebird
74-
PROPERTIES
75-
CXX_STANDARD 11
76-
CXX_STANDARD_REQUIRED TRUE
77-
)
72+
target_compile_features(php_ext_pdo_firebird PRIVATE cxx_std_11)
7873

7974
target_compile_options(
8075
php_ext_pdo_firebird

0 commit comments

Comments
 (0)