Merge pull request #1596 from ericniebler/clangd-helpers

help clangd select the correct target for deducing compiler flags for headers

Author: ericniebler

CMakeLists.txt

@@ -67,11 +67,6 @@ message(STATUS "Build date       : ${STDEXEC_BUILD_DATE}")
 message(STATUS "Build year       : ${STDEXEC_BUILD_YEAR}")
 message(STATUS)
 
-if (STDEXEC_IS_TOP_LEVEL)
-  # Integrate with LLVM/clang tooling
-  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/clangd_compile_info.cmake)
-endif()
-
 # Write the version header
 rapids_cmake_write_version_file(include/stdexec_version_config.hpp)
 
@@ -270,9 +265,13 @@ target_compile_options(stdexec_executable_flags INTERFACE
                        -include stdexec/__detail/__force_include.hpp>
                        )
 
-target_compile_definitions(
-  stdexec_executable_flags INTERFACE
-  $<$<NOT:$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>>:STDEXEC_ENABLE_EXTRA_TYPE_CHECKING>)
+if (STDEXEC_IS_TOP_LEVEL)
+  # Integrate with LLVM/clang tooling
+  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/clangd_compile_info.cmake)
+  add_executable(_clangd_helper_file
+    include/._clangd_helper_file.cpp
+  )
+endif()
 
 # Set up nvexec library
 option(STDEXEC_ENABLE_CUDA "Enable CUDA targets for non-nvc++ compilers" OFF)

examples/CMakeLists.txt

@@ -38,7 +38,6 @@ function(def_example example)
 endfunction()
 
 set(stdexec_examples
-               "example.clangd.helper : _clangd_helper_file.cpp"
                  "example.hello_world : hello_world.cpp"
                   "example.hello_coro : hello_coro.cpp"
                        "example.scope : scope.cpp"

examples/nvexec/CMakeLists.txt

@@ -76,7 +76,6 @@ endfunction()
 # CPU examples
 ###############################################################################
 set(nvexec_cpu_examples
-    " example.nvexec.clangd_helper : _clangd_helper_file.cpp"
     "example.nvexec.maxwell_cpu_mt : maxwell_cpu_mt.cpp"
     "example.nvexec.maxwell_cpu_st : maxwell_cpu_st.cpp"
 )

examples/nvexec/_clangd_helper_file.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 NVIDIA Corporation
+ * Copyright (c) 2025 NVIDIA Corporation
  *
  * Licensed under the Apache License Version 2.0 with LLVM Exceptions
  * (the "License"); you may not use this file except in compliance with

examples/_clangd_helper_file.cpp include/._clangd_helper_file.cppexamples/_clangd_helper_file.cpp renamed to include/._clangd_helper_file.cpp

@@ -72,6 +72,9 @@ set_target_properties(common_test_settings PROPERTIES
     MSVC_DEBUG_INFORMATION_FORMAT Embedded
     )
 target_include_directories(common_test_settings INTERFACE "${CMAKE_CURRENT_LIST_DIR}")
+target_compile_definitions(
+    common_test_settings INTERFACE
+    $<$<NOT:$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>>:STDEXEC_ENABLE_EXTRA_TYPE_CHECKING>)
 
 add_executable(test.stdexec ${stdexec_test_sources})
 target_link_libraries(test.stdexec