| From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001 |
| From: Paulo Neves <ptsneves@gmail.com> |
| Date: Thu, 28 Jul 2022 11:28:41 +0200 |
| Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target |
| |
| $< is a private detail from the Makefile generated by CMakefile and |
| are not under control or to be used at the CMakeLists level. In 3.20 |
| that private generation changed pre-requisite targets[1] and now logs |
| contain the path compiler_depend.ts instead of the actual file. |
| |
| Upstream status: Pending [1] |
| [1] https://github.com/fluent/fluent-bit/issues/5492 |
| --- |
| CMakeLists.txt | 6 +----- |
| lib/chunkio/CMakeLists.txt | 7 +------ |
| lib/cmetrics/CMakeLists.txt | 7 +------ |
| 3 files changed, 3 insertions(+), 17 deletions(-) |
| |
| diff --git a/CMakeLists.txt b/CMakeLists.txt |
| index 3dba5a8..d94b988 100644 |
| --- a/CMakeLists.txt |
| +++ b/CMakeLists.txt |
| @@ -46,11 +46,7 @@ else() |
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") |
| endif() |
| |
| -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
| - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") |
| -else() |
| - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") |
| -endif() |
| +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") |
| |
| if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") |
| set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic") |
| diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt |
| index bbe1f39..809ea93 100644 |
| --- a/lib/chunkio/CMakeLists.txt |
| +++ b/lib/chunkio/CMakeLists.txt |
| @@ -14,12 +14,7 @@ else() |
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ") |
| endif() |
| |
| -# Set __FILENAME__ |
| -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
| - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") |
| -else() |
| - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") |
| -endif() |
| +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") |
| |
| include(cmake/macros.cmake) |
| |
| diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt |
| index 60e8774..e3d6149 100644 |
| --- a/lib/cmetrics/CMakeLists.txt |
| +++ b/lib/cmetrics/CMakeLists.txt |
| @@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3) |
| set(CMT_VERSION_PATCH 5) |
| set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}") |
| |
| -# Define __FILENAME__ consistently across Operating Systems |
| -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
| - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") |
| -else() |
| - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") |
| -endif() |
| +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") |
| |
| # Configuration options |
| option(CMT_DEV "Enable development mode" No) |