Author: brane
Date: Sun Jul  6 01:56:20 2025
New Revision: 1926984

URL: http://svn.apache.org/viewvc?rev=1926984&view=rev
Log:
Follow up to r1926878: Get the generated .clangd back on track.

* build/SerfGenClangd.cmake: Don't look at CMAKE_C_FLAGS any more, since we
   don't update that in CMakeLists.txt. Use SERF_C_DEFINES, SERF_C_WARNINGS
   and APR_CFLAGS instead. Also remove duplicates from the include paths.

Modified:
    serf/trunk/build/SerfGenClangd.cmake

Modified: serf/trunk/build/SerfGenClangd.cmake
URL: 
http://svn.apache.org/viewvc/serf/trunk/build/SerfGenClangd.cmake?rev=1926984&r1=1926983&r2=1926984&view=diff
==============================================================================
--- serf/trunk/build/SerfGenClangd.cmake (original)
+++ serf/trunk/build/SerfGenClangd.cmake Sun Jul  6 01:56:20 2025
@@ -54,24 +54,24 @@ function(SerfGenClangd)
     "  Add:\n")
   write_flags("--language=c")
   write_includes("${CMAKE_SOURCE_DIR}")
-  write_includes("${APR_INCLUDES}")
+
+  list(APPEND includes ${APR_INCLUDES})
   if(NOT APR_CONTAINS_APRUTIL)
-    write_includes("${APRUTIL_INCLUDES}")
+    list(APPEND includes ${APRUTIL_INCLUDES})
   endif()
-  write_includes("${OPENSSL_INCLUDE_DIR}")
-  write_includes("${ZLIB_INCLUDE_DIR}")
+  list(APPEND includes ${OPENSSL_INCLUDE_DIR})
+  list(APPEND includes ${ZLIB_INCLUDE_DIR})
   if(BROTLI_FOUND)
-    write_includes("${BROTLI_INCLUDES}")
+    list(APPEND includes ${BROTLI_INCLUDES})
   endif()
   if(GSSAPI_FOUND)
-    write_includes("${GSSAPI_INCLUDES}")
+    list(APPEND includes ${GSSAPI_INCLUDES})
   endif()
+  list(REMOVE_DUPLICATES includes)
+  write_includes(${includes})
 
-  get_directory_property(cdef COMPILE_DEFINITIONS)
-  write_defines(${cdef})
-
-  set(flags ${CMAKE_C_FLAGS})
-  separate_arguments(flags)
-  write_flags(${flags})
+  write_defines(${SERF_C_DEFINES})
+  write_flags(${SERF_C_WARNINGS})
+  write_flags(${APR_CFLAGS})
 endfunction(SerfGenClangd)
 SerfGenClangd()


Reply via email to