salfter/OpenKJ
1
0
Fork 0
mirror of https://github.com/OpenKJ/OpenKJ.git synced 2025-10-31 09:46:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixing lgtm analysis builds

Browse Source
This commit is contained in:
T. Isaac Lightburn
2021-07-27 21:18:00 -05:00
parent ab92c1bdeb
commit 0c14f2ca80
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -58,21 +58,25 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBS
else ()
set(STATIC_TAGLIB True)
endif ()
pkg_check_modules(SPDLOG IMPORTED_TARGET spdlog)
if (SPDLOG_FOUND)
message(STATUS "Using OS installed spdlog")
add_definitions(-DSPDLOG_FMT_EXTERNAL)
link_directories(${SPDLOG_LIBRARY_DIRS})
include_directories(${SPDLOG_INCLUDE_DIRS})
set(EXTERNAL_SPDLOG True)
# include_directories(
# ${SPDLOG_INCLUDE_DIRS}
# )
if (NOT DEFINED SPDLOG_USE_CPM)
pkg_check_modules(SPDLOG IMPORTED_TARGET spdlog)
if (SPDLOG_FOUND)
message(STATUS "Using OS installed spdlog")
add_definitions(-DSPDLOG_FMT_EXTERNAL)
link_directories(${SPDLOG_LIBRARY_DIRS})
include_directories(${SPDLOG_INCLUDE_DIRS})
set(EXTERNAL_SPDLOG True)
# include_directories(
# ${SPDLOG_INCLUDE_DIRS}
# )
endif ()
else ()
message("SPDLOG_USE_CPM defined, forcing CPM version and ignoring OS packages")
endif ()
endif ()
if (NOT EXTERNAL_SPDLOG)
message(STATUS "No spdlog install found, pulling it in via CPM")
message(STATUS "No spdlog install found or CPM spdlong forced, pulling it in via CPM")
include(cmake/CPM.cmake)
CPMAddPackage("gh:gabime/spdlog@1.8.2")
endif ()