From e2bb965cc03dbe08fd653bf9a10bd3abfdf382b2 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Sat, 21 Nov 2020 15:38:04 +0100 Subject: [PATCH] Fix dropping system C_FLAGS --- .drone.yml | 6 ------ CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5b958a3..3174f1e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,12 +53,6 @@ steps: api_key: from_secret: gitea_token base_url: https://git.serguzim.me - checksum: - - md5 - - sha256 - - sha512 - files: - - emgauwa-core.conf title: ${DRONE_TAG} when: diff --git a/CMakeLists.txt b/CMakeLists.txt index becfc98..e59aabb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ add_executable(core src/main.c) target_link_libraries(core -lsqlite3) target_link_libraries(core -luuid) -set(CMAKE_C_FLAGS "$ENV{CFLAGS}") -set(CMAKE_C_FLAGS "-D'__FILENAME__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR}/src/)/,,$(abspath $<))\"'") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D'__FILENAME__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR}/src/)/,,$(abspath $<))\"'") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -std=gnu99 -Wpedantic -Werror -Wall -Wextra") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -fprofile-arcs -ftest-coverage")