Skip to content

Commit d9161f9

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents aac95d6 + 87989f0 commit d9161f9

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_LIST_DIR)
6767
)
6868
endif()
6969

70+
# Ignore build directory in Git repository.
71+
block()
72+
file(GLOB files "${CMAKE_CURRENT_BINARY_DIR}/*")
73+
if(files PATH_EQUAL ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
74+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/.gitignore "*\n")
75+
endif()
76+
endblock()
77+
7078
project(
7179
PhpBuildSystem
7280
VERSION 8.4

cmake/cmake/CMakeDefaults.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ if(CMAKE_BINARY_DIR PATH_EQUAL CMAKE_CURRENT_SOURCE_DIR)
1818
)
1919
endif()
2020

21+
# Ignore build directory in Git repository.
22+
block()
23+
file(GLOB files "${CMAKE_CURRENT_BINARY_DIR}/*")
24+
if(files PATH_EQUAL ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
25+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/.gitignore "*\n")
26+
endif()
27+
endblock()
28+
2129
# Add paths where include() and find_package() look for modules.
2230
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
2331

0 commit comments

Comments
 (0)