Skip to content

Commit fc4ea24

Browse files
authored
Library cleanup & fixes (#57)
No need to look for `fmtlib` as we use the bundled one from `spdlog` Use header only `spdlog` in release builds for speed and also to avoid CRT DLL boundary related issue affecting Windows
1 parent 752ae47 commit fc4ea24

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

CMakeLists.txt

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
5252
find_package(glfw3 REQUIRED)
5353
endif()
5454

55-
# Try to find static spdlog (needs fmt too)
56-
find_library(SPDLOG_STATIC_LIB NAMES libspdlog.a spdlog PATHS /opt/homebrew/opt/spdlog/lib /usr/local/lib NO_DEFAULT_PATH)
57-
find_library(FMT_STATIC_LIB NAMES libfmt.a fmt PATHS /opt/homebrew/opt/fmt/lib /usr/local/lib NO_DEFAULT_PATH)
58-
if(SPDLOG_STATIC_LIB AND FMT_STATIC_LIB)
59-
message(STATUS "Found static spdlog: ${SPDLOG_STATIC_LIB}")
60-
message(STATUS "Found static fmt: ${FMT_STATIC_LIB}")
61-
set(spdlog_FOUND TRUE)
62-
else()
63-
find_package(spdlog REQUIRED)
64-
endif()
55+
find_package(spdlog REQUIRED)
6556
else()
6657
find_package(glfw3 REQUIRED)
6758
find_package(spdlog REQUIRED)
@@ -148,13 +139,14 @@ endif()
148139

149140
target_link_libraries(${PROJECT_NAME} PRIVATE volk)
150141

151-
if(CMAKE_BUILD_TYPE STREQUAL "Release" AND SPDLOG_STATIC_LIB AND FMT_STATIC_LIB)
152-
target_link_libraries(${PROJECT_NAME} PRIVATE ${SPDLOG_STATIC_LIB} ${FMT_STATIC_LIB})
153-
target_include_directories(${PROJECT_NAME} PRIVATE /opt/homebrew/opt/spdlog/include)
142+
if(CMAKE_BUILD_TYPE STREQUAL "Release")
143+
set(SPDLOG_TARGET spdlog::spdlog_header_only)
154144
else()
155-
target_link_libraries(${PROJECT_NAME} PRIVATE spdlog::spdlog)
145+
set(SPDLOG_TARGET spdlog::spdlog)
156146
endif()
157147

148+
target_link_libraries(${PROJECT_NAME} PRIVATE ${SPDLOG_TARGET})
149+
158150
target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV)
159151

160152
# Include Vulkan headers for types (volk needs them)

0 commit comments

Comments
 (0)