Add timelib and libmbfl using target_sources in subdirectory

petk · petk · commit 485ea4765831 · 2024-12-14T23:42:10.000+01:00
diff --git a/cmake/ext/date/CMakeLists.txt b/cmake/ext/date/CMakeLists.txt
@@ -13,7 +13,6 @@ project(
   LANGUAGES C
 )
 
-include(CheckIncludeFile)
 include(FeatureSummary)
 
 add_feature_info(
@@ -22,66 +21,34 @@ add_feature_info(
   "date and time"
 )
 
-# Check for headers needed by timelib.
-check_include_file(io.h HAVE_IO_H)
-
 add_library(php_date OBJECT)
 
 target_sources(
   php_date
   PRIVATE
-    lib/astro.c
-    lib/dow.c
-    lib/interval.c
-    lib/parse_date.c
-    lib/parse_iso_intervals.c
-    lib/parse_posix.c
-    lib/parse_tz.c
-    lib/timelib.c
-    lib/tm2unixtime.c
-    lib/unixtime2tm.c
     php_date.c
     php_date.stub.php
   PUBLIC
     FILE_SET HEADERS
       FILES
-        lib/timelib.h
         php_date.h
-  # A separate file set so binary dir can also be created within a source dir.
-  PUBLIC
-    FILE_SET HEADERS
-      BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
-      FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/lib/timelib_config.h
 )
 
-target_include_directories(php_date PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/lib)
+target_compile_definitions(php_date PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 target_compile_options(
   php_date
   PRIVATE
     $<$<COMPILE_LANG_AND_ID:C,MSVC>:/wd4244>
 )
 
-target_compile_definitions(
-  php_date
-  PRIVATE
-    ZEND_ENABLE_STATIC_TSRMLS_CACHE
-    HAVE_TIMELIB_CONFIG_H
-    # The timelib uses C99 strtoll() function conditionally.
-    HAVE_STRTOLL
-)
+# Configure timelib.
+set(TIMELIB_TARGET php_date)
+add_subdirectory(lib)
 
 set(HAVE_TIMELIB_CONFIG_H TRUE)
 
-cmake_path(
-  RELATIVE_PATH
-  CMAKE_CURRENT_BINARY_DIR
-  BASE_DIRECTORY ${CMAKE_BINARY_DIR}
-  OUTPUT_VARIABLE relativeDir
-)
-message(STATUS "Creating ${relativeDir}/lib/timelib_config.h")
-file(CONFIGURE OUTPUT lib/timelib_config.h CONTENT [[
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/lib/timelib_config.h "\n" [[
 #ifdef PHP_WIN32
 # include "config.w32.h"
 #else
diff --git a/cmake/ext/date/lib/CMakeLists.txt b/cmake/ext/date/lib/CMakeLists.txt
@@ -0,0 +1,77 @@
+#[=============================================================================[
+# timelib
+
+Simplified CMake-based build system for the timelib library.
+
+## Basic usage
+
+Adding timelib with `add_subdirectory()`:
+
+```cmake
+set(TIMELIB_TARGET php_date)
+add_subdirectory(lib)
+```
+#]=============================================================================]
+
+include(CheckIncludeFile)
+
+if(NOT TIMELIB_TARGET)
+  set(TIMELIB_TARGET timelib)
+  add_library(${TIMELIB_TARGET})
+endif()
+
+set(
+  timelibSources
+    astro.c
+    dow.c
+    interval.c
+    parse_date.c
+    parse_iso_intervals.c
+    parse_posix.c
+    parse_tz.c
+    timelib.c
+    tm2unixtime.c
+    unixtime2tm.c
+)
+
+target_sources(
+  ${TIMELIB_TARGET}
+  PRIVATE ${timelibSources}
+  PUBLIC
+    FILE_SET HEADERS
+      FILES
+        timelib.h
+  # A separate file set so binary dir can also be created within a source dir.
+  PUBLIC
+    FILE_SET HEADERS
+      BASE_DIRS $<TARGET_PROPERTY:${TIMELIB_TARGET},BINARY_DIR>
+      FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/timelib_config.h
+)
+
+target_include_directories(${TIMELIB_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+
+target_compile_definitions(
+  ${TIMELIB_TARGET}
+  PRIVATE
+    HAVE_TIMELIB_CONFIG_H
+    # The timelib uses C99 strtoll() function conditionally.
+    HAVE_STRTOLL
+)
+
+# The libmbfl configuration.
+
+check_include_file(io.h HAVE_IO_H)
+
+cmake_path(
+  RELATIVE_PATH
+  CMAKE_CURRENT_BINARY_DIR
+  BASE_DIRECTORY ${CMAKE_BINARY_DIR}
+  OUTPUT_VARIABLE relativeDir
+)
+message(STATUS "Creating ${relativeDir}/timelib_config.h")
+
+file(CONFIGURE OUTPUT timelib_config.h CONTENT [[
+/* Define to 1 if you have the <io.h> header file. */
+#cmakedefine HAVE_IO_H 1
+]])
diff --git a/cmake/ext/mbstring/CMakeLists.txt b/cmake/ext/mbstring/CMakeLists.txt
@@ -84,70 +84,14 @@ endif()
 target_sources(
   php_mbstring
   PRIVATE
-    libmbfl/filters/html_entities.c
-    libmbfl/filters/mbfilter_7bit.c
-    libmbfl/filters/mbfilter_base64.c
-    libmbfl/filters/mbfilter_cjk.c
-    libmbfl/filters/mbfilter_htmlent.c
-    libmbfl/filters/mbfilter_qprint.c
-    libmbfl/filters/mbfilter_singlebyte.c
-    libmbfl/filters/mbfilter_ucs2.c
-    libmbfl/filters/mbfilter_ucs4.c
-    libmbfl/filters/mbfilter_utf16.c
-    libmbfl/filters/mbfilter_utf32.c
-    libmbfl/filters/mbfilter_utf7.c
-    libmbfl/filters/mbfilter_utf7imap.c
-    libmbfl/filters/mbfilter_utf8_mobile.c
-    libmbfl/filters/mbfilter_utf8.c
-    libmbfl/filters/mbfilter_uuencode.c
-    libmbfl/mbfl/mbfilter_8bit.c
-    libmbfl/mbfl/mbfilter_pass.c
-    libmbfl/mbfl/mbfilter_wchar.c
-    libmbfl/mbfl/mbfilter.c
-    libmbfl/mbfl/mbfl_convert.c
-    libmbfl/mbfl/mbfl_encoding.c
-    libmbfl/mbfl/mbfl_filter_output.c
-    libmbfl/mbfl/mbfl_language.c
-    libmbfl/mbfl/mbfl_memory_device.c
-    libmbfl/mbfl/mbfl_string.c
-    libmbfl/nls/nls_de.c
-    libmbfl/nls/nls_en.c
-    libmbfl/nls/nls_hy.c
-    libmbfl/nls/nls_ja.c
-    libmbfl/nls/nls_kr.c
-    libmbfl/nls/nls_neutral.c
-    libmbfl/nls/nls_ru.c
-    libmbfl/nls/nls_tr.c
-    libmbfl/nls/nls_ua.c
-    libmbfl/nls/nls_uni.c
-    libmbfl/nls/nls_zh.c
     mb_gpc.c
     mbstring.c
     mbstring.stub.php
     php_unicode.c
   PUBLIC
     FILE_SET HEADERS
       FILES
-        libmbfl/mbfl/eaw_table.h
-        libmbfl/mbfl/mbfilter_8bit.h
-        libmbfl/mbfl/mbfilter_pass.h
-        libmbfl/mbfl/mbfilter_wchar.h
-        libmbfl/mbfl/mbfilter.h
-        libmbfl/mbfl/mbfl_consts.h
-        libmbfl/mbfl/mbfl_convert.h
-        libmbfl/mbfl/mbfl_defs.h
-        libmbfl/mbfl/mbfl_encoding.h
-        libmbfl/mbfl/mbfl_filter_output.h
-        libmbfl/mbfl/mbfl_language.h
-        libmbfl/mbfl/mbfl_memory_device.h
-        libmbfl/mbfl/mbfl_string.h
         mbstring.h
-  # A separate file set so binary dir can also be created within a source dir.
-  PUBLIC
-    FILE_SET HEADERS
-      BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
-      FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/libmbfl/config.h
 )
 
 target_compile_definitions(php_mbstring PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
@@ -164,27 +108,21 @@ set(HAVE_MBSTRING TRUE)
 # Configure libmbfl.
 ################################################################################
 
-# TODO: Fix this better. See also https://github.com/php/php-src/pull/13713
-# TODO: Should status message be here?
-message(STATUS "Creating ext/mbstring/libmbfl/config.h")
-file(CONFIGURE OUTPUT libmbfl/config.h CONTENT [[
+set(LIBMBFL_TARGET php_mbstring)
+add_subdirectory(libmbfl)
+
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libmbfl/config.h "\n" [[
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #ifdef _WIN32
 # define HAVE_STRICMP 1
-#elif defined HAVE_CONFIG_H
-# include "<config.h>"
+# include <config.w32.h>
 #else
-# include <main/php_config.h>
+# include <php_config.h>
 #endif
 ]])
 
-target_include_directories(
-  php_mbstring
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/libmbfl
-    ${CMAKE_CURRENT_BINARY_DIR}/libmbfl
-    ${CMAKE_CURRENT_SOURCE_DIR}/libmbfl/mbfl
-)
-
 ################################################################################
 # Multibyte regex.
 ################################################################################
diff --git a/cmake/ext/mbstring/libmbfl/CMakeLists.txt b/cmake/ext/mbstring/libmbfl/CMakeLists.txt
@@ -0,0 +1,121 @@
+#[=============================================================================[
+# libmbfl
+
+Simplified CMake-based build system for the libmbfl library. Since libmbfl is
+closely integrated and intertwined with PHP sources, the `target_sources()`
+approach is used, with no alternative implementations provided at this stage.
+
+## Basic usage
+
+Adding libmbfl with `add_subdirectory()`:
+
+```cmake
+set(LIBMBFL_TARGET php_mbstring)
+add_subdirectory(libmbfl)
+```
+#]=============================================================================]
+
+include(CheckIncludeFile)
+include(CheckSymbolExists)
+
+if(NOT LIBMBFL_TARGET)
+  set(LIBMBFL_TARGET libmbfl)
+  add_library(${LIBMBFL_TARGET})
+endif()
+
+target_sources(
+  ${LIBMBFL_TARGET}
+  PRIVATE
+    filters/html_entities.c
+    filters/mbfilter_7bit.c
+    filters/mbfilter_base64.c
+    filters/mbfilter_cjk.c
+    filters/mbfilter_htmlent.c
+    filters/mbfilter_qprint.c
+    filters/mbfilter_singlebyte.c
+    filters/mbfilter_ucs2.c
+    filters/mbfilter_ucs4.c
+    filters/mbfilter_utf16.c
+    filters/mbfilter_utf32.c
+    filters/mbfilter_utf7.c
+    filters/mbfilter_utf7imap.c
+    filters/mbfilter_utf8_mobile.c
+    filters/mbfilter_utf8.c
+    filters/mbfilter_uuencode.c
+    mbfl/mbfilter_8bit.c
+    mbfl/mbfilter_pass.c
+    mbfl/mbfilter_wchar.c
+    mbfl/mbfilter.c
+    mbfl/mbfl_convert.c
+    mbfl/mbfl_encoding.c
+    mbfl/mbfl_filter_output.c
+    mbfl/mbfl_language.c
+    mbfl/mbfl_memory_device.c
+    mbfl/mbfl_string.c
+    nls/nls_de.c
+    nls/nls_en.c
+    nls/nls_hy.c
+    nls/nls_ja.c
+    nls/nls_kr.c
+    nls/nls_neutral.c
+    nls/nls_ru.c
+    nls/nls_tr.c
+    nls/nls_ua.c
+    nls/nls_uni.c
+    nls/nls_zh.c
+  PUBLIC
+    FILE_SET HEADERS
+      FILES
+        mbfl/eaw_table.h
+        mbfl/mbfilter_8bit.h
+        mbfl/mbfilter_pass.h
+        mbfl/mbfilter_wchar.h
+        mbfl/mbfilter.h
+        mbfl/mbfl_consts.h
+        mbfl/mbfl_convert.h
+        mbfl/mbfl_defs.h
+        mbfl/mbfl_encoding.h
+        mbfl/mbfl_filter_output.h
+        mbfl/mbfl_language.h
+        mbfl/mbfl_memory_device.h
+        mbfl/mbfl_string.h
+  # A separate file set so binary dir can also be created within a source dir.
+  PUBLIC
+    FILE_SET HEADERS
+      BASE_DIRS $<TARGET_PROPERTY:${LIBMBFL_TARGET},BINARY_DIR>
+      FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
+
+target_include_directories(
+  ${LIBMBFL_TARGET}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/mbfl
+)
+
+target_compile_definitions(
+  ${LIBMBFL_TARGET}
+  PRIVATE
+    $<$<AND:$<PLATFORM_ID:Windows>,$<IN_LIST:$<TARGET_PROPERTY:${LIBMBFL_TARGET},TYPE>,MODULE_LIBRARY$<SEMICOLON>SHARED_LIBRARY>>:MBFL_DLL_EXPORT>
+)
+
+# The libmbfl configuration header.
+check_include_file(strings.h HAVE_STRINGS_H)
+check_symbol_exists(strcasecmp "strings.h" HAVE_STRCASECMP)
+
+cmake_path(
+  RELATIVE_PATH
+  CMAKE_CURRENT_BINARY_DIR
+  BASE_DIRECTORY ${CMAKE_BINARY_DIR}
+  OUTPUT_VARIABLE relativeDir
+)
+message(STATUS "Creating ${relativeDir}/config.h")
+file(CONFIGURE OUTPUT config.h CONTENT [[
+/* Define to 1 if you have the 'strcasecmp' function. */
+#cmakedefine HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#cmakedefine HAVE_STRINGS_H 1
+]])
