Skip to content

Commit

Permalink
build: fix broken build for clang by removing erroneous generator for…
Browse files Browse the repository at this point in the history
… fmt library, which we do not explicitly depend on ourselves

We depend on fmt transitively through spdlog. Unfortunately, this makes us unable to explicitly depend
on a different version of fmt. (There is the newer version 11.0.2 available on conan center, but
spdlog still depends on version 10.2.1). With that fmt version there is a bug appearing when using a new
version of clang-20. This bug does not appear when not calling the generator for fmt as well.
  • Loading branch information
Taepper authored and fengelniederhammer committed Oct 24, 2024
1 parent be5fa16 commit 924521e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ endif ()

set(CMAKE_CXX_STANDARD 20)

# For find_package calls in Module mode (looking for the Find<lib>.cmake files)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_BINARY_DIR}/generators/")
# For find_package calls in config mode / find_dependency calls
# (looking for the <lib>-config.cmake files of transitive dependencies of modules, e.g. spdlog->fmt)
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${CMAKE_BINARY_DIR}/generators/")

# ---------------------------------------------------------------------------
# Logging
Expand Down
1 change: 0 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ def generate(self):
deps = CMakeDeps(self)
deps.set_property("boost", "cmake_find_mode", "both")
deps.set_property("duckdb", "cmake_find_mode", "both")
deps.set_property("fmt", "cmake_find_mode", "both")
deps.set_property("gtest", "cmake_find_mode", "both")
deps.set_property("hwloc", "cmake_find_mode", "both")
deps.set_property("nlohmann_json", "cmake_find_mode", "both")
Expand Down

0 comments on commit 924521e

Please sign in to comment.