summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--Makefile6
2 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5db8b45894..f3585dd104 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS OFF)
set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Required to avoid warnings when setting visibility
cmake_policy(SET CMP0063 NEW)
diff --git a/Makefile b/Makefile
index d25cb8b402..8f2c997297 100644
--- a/Makefile
+++ b/Makefile
@@ -175,8 +175,7 @@ $(MACOS_COMPDB_PATH)/Makefile:
mkdir -p $(MACOS_COMPDB_PATH)
(cd $(MACOS_COMPDB_PATH) && cmake ../../../.. \
-DCMAKE_BUILD_TYPE=$(BUILDTYPE) \
- -DWITH_EGL=${WITH_EGL} \
- -DCMAKE_EXPORT_COMPILE_COMMANDS=ON)
+ -DWITH_EGL=${WITH_EGL})
.PHONY:
compdb: $(BUILD_DEPS) $(TEST_DEPS) $(MACOS_COMPDB_PATH)/Makefile
@@ -302,7 +301,6 @@ $(LINUX_BUILD): $(BUILD_DEPS)
mkdir -p $(LINUX_OUTPUT_PATH)
(cd $(LINUX_OUTPUT_PATH) && cmake -G Ninja ../../.. \
-DCMAKE_BUILD_TYPE=$(BUILDTYPE) \
- -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DWITH_CXX11ABI=${WITH_CXX11ABI} \
-DWITH_COVERAGE=${WITH_COVERAGE} \
-DWITH_OSMESA=${WITH_OSMESA} \
@@ -396,7 +394,6 @@ $(QT_BUILD): $(BUILD_DEPS)
mkdir -p $(QT_OUTPUT_PATH)
(cd $(QT_OUTPUT_PATH) && cmake -G Ninja ../../.. \
-DCMAKE_BUILD_TYPE=$(BUILDTYPE) \
- -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DMBGL_PLATFORM=qt \
-DMASON_PLATFORM=$(MASON_PLATFORM) \
-DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \
@@ -438,7 +435,6 @@ $(QNX_QT_BUILD): $(BUILD_DEPS)
mkdir -p $(QNX_OUTPUT_PATH)
(cd $(QNX_OUTPUT_PATH) && cmake -G Ninja ../../.. \
-DCMAKE_BUILD_TYPE=$(BUILDTYPE) \
- -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DQCC_COMPILER_TARGET=${QCC_COMPILER_TARGET} \
-DQCC_NTOARCH=${QCC_NTOARCH} \
-DCMAKE_TOOLCHAIN_FILE=platform/qt/qnx.cmake \