Skip to content

Commit 3bfb815

Browse files
committed
Move config.cmake.h.in files to cmake subdirectories
As Autotools already generates config.h.in files, there is a naming inconvenience for these templates. Projects usually solve this by naming CMake header templates with non-standard names like config.cmake.h.in or differently (config-cmake.h.in)... Still, the name config.h.in seems the most convenient on the expense of residing in a subdirectory. Another option would be to do this for extensions or SAPIs inside CMakeLists.txt but makes CMake code a bit less readable as there is no syntax highlighting inside such bracket or quoted arguments: | file(CONFIGURE OUTPUT config.h CONTENT [[ | /* Define to 1 if the PHP extension 'bcmath' is available. */ | #cmakedefine HAVE_BCMATH 1 | ]])
1 parent cb74b8c commit 3bfb815

File tree

146 files changed

+138
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+138
-125
lines changed

cmake/cmake/modules/PHP/ThreadSafety.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ target_compile_definitions(php_configuration INTERFACE ZTS)
8080
set_target_properties(php_configuration PROPERTIES PHP_THREAD_SAFETY ON)
8181

8282
# Add compile definitions for POSIX threads conformance.
83-
# TODO: Recheck these definitions since many of them are deprecated or
84-
# obsolete in favor of the compiler automatic definitions when using threading
85-
# flag on such system.
83+
# TODO: Recheck these definitions since many of them are deprecated or obsolete
84+
# in favor of the compiler automatic definitions when using threading flag on
85+
# such system.
8686
target_compile_definitions(
8787
php_configuration
8888
INTERFACE

cmake/ext/bcmath/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ target_compile_definitions(php_bcmath PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
8686

8787
set(HAVE_BCMATH TRUE)
8888

89-
configure_file(config.cmake.h.in config.h)
89+
configure_file(cmake/config.h.in config.h)
File renamed without changes.

cmake/ext/bz2/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ endif()
9797

9898
set(HAVE_BZ2 TRUE)
9999

100-
configure_file(config.cmake.h.in config.h)
100+
configure_file(cmake/config.h.in config.h)
File renamed without changes.

cmake/ext/calendar/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ target_sources(
7070

7171
set(HAVE_CALENDAR TRUE)
7272

73-
configure_file(config.cmake.h.in config.h)
73+
configure_file(cmake/config.h.in config.h)
File renamed without changes.

cmake/ext/com_dotnet/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ check_include_file(mscoree.h HAVE_MSCOREE_H)
9393

9494
set(HAVE_COM_DOTNET TRUE)
9595

96-
configure_file(config.cmake.h.in config.h)
96+
configure_file(cmake/config.h.in config.h)
File renamed without changes.

cmake/ext/ctype/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ target_sources(
6464

6565
set(HAVE_CTYPE TRUE)
6666

67-
configure_file(config.cmake.h.in config.h)
67+
configure_file(cmake/config.h.in config.h)

0 commit comments

Comments
 (0)