Export compile commands by default, add standard include dirs (clangd…

… problem)
prtzl · Sep 22, 2022 · 62edcf8 · 62edcf8
1 parent eea5cc9
commit 62edcf8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(${PROJECT_NAME})
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Project)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
     set(CMAKE_BUILD_TYPE Debug)
@@ -33,6 +34,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
 set(CMAKE_CXX_EXTENSIONS ON)
 
 ###############################################################################

diff --git a/Makefile b/Makefile
@@ -32,7 +32,6 @@ $(BUILD_DIR)/Makefile: CMakeLists.txt
 		-DPROJECT_NAME=$(PROJECT_NAME) \
 		-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
 		-DCMAKE_TOOLCHAIN_FILE=gcc-arm-none-eabi.cmake \
-		-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 		-DDUMP_ASM=OFF
 
 # Formats all user modified source files (add ones that are missing)