Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't overwrite all of CFLAGS/CXXFLAGS in prometheus-cpp build #111

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Don't overwrite all of CFLAGS/CXXFLAGS in prometheus-cpp build #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions FindPrometheusCpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ set(prometheuscpp_src "${CMAKE_CURRENT_SOURCE_DIR}/auxil/prometheus-cpp")
set(_sharedlibs ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF)

# These need to be reset before setting up Prometheus because otherwise it picks up
# the -DDEBUG from SetDefaultCompileFlags and causes civetweb to output a bunch of
# debugging information. Let the library figure out its own flags.
# The -DDEBUG flag from SetDefaultCompileFlags causes civetweb in prometheus-cpp
# to output a bunch of debugging information. Remove it from the flags before
# allowing them to pass through to the prometheus-cpp build.
set(_cxxflags ${CMAKE_CXX_FLAGS})
set(CMAKE_CXX_FLAGS "")
set(_cflags ${CMAKE_C_FLAGS})
set(CMAKE_C_FLAGS "")

string(REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS "${_cxxflags}")
string(REPLACE "-DDEBUG" "" CMAKE_C_FLAGS "${_cflags}")

option(ENABLE_PUSH "" OFF)
option(ENABLE_TESTING "" OFF)
Expand All @@ -25,7 +26,6 @@ message("=======================================================================

set(zeekdeps ${zeekdeps} prometheus-cpp::core prometheus-cpp::pull)
include_directories(BEFORE ${prometheuscpp_src}/pull/include ${prometheuscpp_src}/core/include)
#include_directories(BEFORE ${prometheuscpp_src}/3rdparty/civetweb/include)
include_directories(BEFORE ${prometheuscpp_build}/pull/include ${prometheuscpp_build}/core/include)

set(BUILD_SHARED_LIBS ${_sharedlibs})
Expand Down
Loading