Skip to content

Commit

Permalink
Merge branch 'PHP-8.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
petk committed Jan 20, 2025
2 parents f1a6bf8 + 90813d2 commit 174a6ba
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,7 @@ jobs:
sudo systemctl restart snmpd
- name: Run tests
run: |
ctest --preset all-enabled
run: ctest --preset all-enabled

- name: Install PHP
run: cmake --install php-build/all-enabled
18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,7 @@ further information.

cmake_minimum_required(VERSION 3.25...3.31)

project(
PhpBuildSystem
VERSION 8.5
DESCRIPTION "CMake-based PHP build system"
HOMEPAGE_URL "https://github.com/petk/php-build-system"
LANGUAGES NONE
)

if(PROJECT_IS_TOP_LEVEL AND CMAKE_SOURCE_DIR PATH_EQUAL CMAKE_BINARY_DIR)
if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_LIST_DIR)
message(
FATAL_ERROR
"In-source builds are disabled. Please, set the build directory.\n"
Expand All @@ -75,6 +67,14 @@ if(PROJECT_IS_TOP_LEVEL AND CMAKE_SOURCE_DIR PATH_EQUAL CMAKE_BINARY_DIR)
)
endif()

project(
PhpBuildSystem
VERSION 8.5
DESCRIPTION "CMake-based PHP build system"
HOMEPAGE_URL "https://github.com/petk/php-build-system"
LANGUAGES NONE
)

# Configuration.
block(PROPAGATE phpUrl)
set(
Expand Down
2 changes: 1 addition & 1 deletion cmake/sapi/embed/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_sources(
target_link_libraries(
php_sapi_embed
PRIVATE
PHP::sapi
$<BUILD_INTERFACE:PHP::sapi>
)

target_compile_definitions(php_sapi_embed PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
Expand Down

0 comments on commit 174a6ba

Please sign in to comment.