Skip to content

Commit

Permalink
Revert "Disabled usage of GLOG, libmagic and sa.core as described in …
Browse files Browse the repository at this point in the history
…solution 1 for issue #115."

This reverts commit a9e5849.
  • Loading branch information
end2endzone committed Feb 8, 2023
1 parent d0134f5 commit 9b06d6f
Show file tree
Hide file tree
Showing 3 changed files with 716 additions and 752 deletions.
13 changes: 6 additions & 7 deletions src/shellextension/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ add_library(sa.shellextension SHARED
${SHELLANYTHING_VERSION_RC}
${CMAKE_SOURCE_DIR}/src/resource.rc.in
${CMAKE_SOURCE_DIR}/src/version.rc.in
logger_stub.h
shellext.cpp
shellext.h
shellext.def
Expand All @@ -21,20 +20,20 @@ target_include_directories(sa.shellextension
$<INSTALL_INTERFACE:${SHELLANYTHING_INSTALL_INCLUDE_DIR}> # for clients using the installed library.
PRIVATE
rapidassist
# glog::glog
# libmagic
glog::glog
libmagic
${CMAKE_SOURCE_DIR}/src/shared
# ${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core
)

# Define linking dependencies.
target_link_libraries(sa.shellextension
PRIVATE
# sa.core
sa.core
sa.shared
rapidassist
# glog::glog
# libmagic
glog::glog
libmagic
)

# Define files that will be part of the installation package.
Expand Down
Loading

0 comments on commit 9b06d6f

Please sign in to comment.