Adjust include directories

Author: petk

cmake/ext/lexbor/CMakeLists.txt

@@ -23,6 +23,12 @@ add_feature_info(
 
 add_library(php_ext_lexbor OBJECT)
 
+file(
+  GLOB_RECURSE lexborHeaders
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/lexbor/*.h
+)
+
 target_sources(
   php_ext_lexbor
   PRIVATE
@@ -208,6 +214,10 @@ target_sources(
         php_lexbor.h
 )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  target_sources(php_ext_lexbor PUBLIC FILE_SET HEADERS FILES ${lexborHeaders})
+endif()
+
 target_compile_definitions(
   php_ext_lexbor
   PRIVATE
@@ -220,6 +230,13 @@ target_compile_options(
   PRIVATE $<$<COMPILE_LANG_AND_ID:C,MSVC>:/utf-8>
 )
 
+target_include_directories(
+  php_ext_lexbor
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PHP_INCLUDE_PREFIX}/ext/lexbor>
+)
+
 set(HAVE_LEXBOR TRUE)
 set(LEXBOR_VERSION "2.5.0")
 

cmake/ext/uri/CMakeLists.txt

@@ -47,29 +47,20 @@ target_sources(
     FILE_SET HEADERS
       FILES
         php_uri.h
+        $<$<PLATFORM_ID:Windows>:uriparser/include/uriparser/Uri.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/include/uriparser/UriBase.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/include/uriparser/UriDefsAnsi.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/include/uriparser/UriDefsConfig.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/include/uriparser/UriDefsUnicode.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/include/uriparser/UriIp4.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/src/UriCommon.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/src/UriConfig.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/src/UriIp4Base.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/src/UriMemory.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/src/UriNormalizeBase.h>
+        $<$<PLATFORM_ID:Windows>:uriparser/src/UriParseBase.h>
 )
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  target_sources(
-    php_ext_uri
-    PUBLIC
-      FILE_SET HEADERS
-        FILES
-          uriparser/include/uriparser/Uri.h
-          uriparser/include/uriparser/UriBase.h
-          uriparser/include/uriparser/UriDefsAnsi.h
-          uriparser/include/uriparser/UriDefsConfig.h
-          uriparser/include/uriparser/UriDefsUnicode.h
-          uriparser/include/uriparser/UriIp4.h
-          uriparser/src/UriCommon.h
-          uriparser/src/UriConfig.h
-          uriparser/src/UriIp4Base.h
-          uriparser/src/UriMemory.h
-          uriparser/src/UriNormalizeBase.h
-          uriparser/src/UriParseBase.h
-  )
-endif()
-
 target_compile_definitions(
   php_ext_uri
   PRIVATE

cmake/sapi/embed/php-embed.pc.in

@@ -33,6 +33,6 @@ URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 Cflags.private: @PHP_CFLAGS_PRIVATE@
-Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext
+Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext -I${includedir}/${php_include_prefix}/ext/lexbor
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs: -L${libdir} -lphp

cmake/sapi/phpdbg/phpdbg.pc.in

@@ -33,6 +33,6 @@ URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 Cflags.private: @PHP_CFLAGS_PRIVATE@
-Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext
+Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext -I${includedir}/${php_include_prefix}/ext/lexbor
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs: -L${libdir} -lphpdbg

cmake/scripts/CMakeLists.txt

@@ -66,6 +66,15 @@ block()
     content
     "${content}"
   )
+  # For consistency, add include directories that were specified as
+  # INSTALL_INTERFACE.
+  string(
+    REGEX REPLACE
+    "\nincludes=\"([^\"]+)\""
+    "\nincludes=\"\\1 -I$include_dir/ext/lexbor\""
+    content
+    "${content}"
+  )
 
   php_configure_file(
     CONTENT "${content}"

cmake/scripts/php.pc.in

@@ -33,6 +33,6 @@ URL: https://www.php.net
 License: PHP
 Version: @PHP_VERSION@
 Cflags.private: @PHP_CFLAGS_PRIVATE@
-Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext
+Cflags: -I${includedir}/${php_include_prefix} -I${includedir}/${php_include_prefix}/main -I${includedir}/${php_include_prefix}/TSRM -I${includedir}/${php_include_prefix}/Zend -I${includedir}/${php_include_prefix}/ext -I${includedir}/${php_include_prefix}/ext/lexbor
 Libs.private: @PHP_LIBS_PRIVATE@
 Libs: