Mercurial > hgrepos > FreeBSD > ports > net-mgmt > prometheus-client-c

annotate files/patch-promhttp_CMakeLists.txt @ 10:40cf179a620e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Allow to build with clang/cc instead of gcc. CMakeLists.txt needed proper tewaking. Also assume that libprom.so is already installed (header and lib) into /usr/local/{include,lib}.
author Franz Glasner <fzglas.hg@dom66.de>
date Tue, 18 Mar 2025 20:37:29 +0100
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1 --- promhttp/CMakeLists.txt.orig 2020-12-08 07:38:13 UTC
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
2 +++ promhttp/CMakeLists.txt
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
3 @@ -38,7 +38,7 @@ set(private_files ${private_dir}/promhttp.c)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
4 set(public_files ${public_dir}/promhttp.h)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
5 set(private_files ${private_dir}/promhttp.c)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
6
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
7 -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../prom/build)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
8 +link_directories(/usr/local/lib)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
9
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
10 include(FindThreads)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
11
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
12 @@ -46,7 +46,7 @@ target_include_directories(
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
13
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
14 target_include_directories(
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
15 promhttp
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
16 - PUBLIC ${public_dir} /usr/include ${prom_include_dir}
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
17 + PUBLIC ${public_dir} /usr/include /usr/local/include
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
18 PRIVATE ${private_dir}
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
19 )
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
20
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
21 @@ -56,8 +56,8 @@ target_sources(
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
22 PRIVATE ${private_files}
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
23 )
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
24
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
25 -find_library(prom prom HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../prom/build)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
26 -find_library(microhttpd microhttpd)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
27 +find_library(prom prom HINT /usr/local/lib)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
28 +find_library(microhttpd microhttpd HINT /usr/local/lib)
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
29
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
30 target_compile_options(promhttp PRIVATE "-Werror" "-Wuninitialized" "-Wall" "-Wno-unused-label" "-std=gnu11")
40cf179a620e FIX: Allow to build with clang/cc instead of gcc.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
31 target_compile_options(promhttp PUBLIC "-Werror" "-Wuninitialized" "-Wall" "-Wno-unused-label" "-std=gnu11")