Skip to content

Commit

Permalink
build: directly link glog by its namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
WhiredPlanck committed Oct 30, 2023
1 parent e07e7c0 commit 6147314
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 31 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ if(ENABLE_LOGGING)
include_directories(${Gflags_INCLUDE_PATH})
endif()

find_package(Glog REQUIRED)
if(Glog_FOUND)
include_directories(${Glog_INCLUDE_PATH})
endif()
find_package(glog REQUIRED)
if(Glog_STATIC)
add_definitions(-DGOOGLE_GLOG_DLL_DECL=)
endif()
Expand Down
26 changes: 0 additions & 26 deletions cmake/FindGlog.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ endif()

set(rime_core_deps
${Boost_LIBRARIES}
${Glog_LIBRARY}
glog::glog
${YamlCpp_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${rime_optional_deps})
Expand Down

0 comments on commit 6147314

Please sign in to comment.