Skip to content

Commit

Permalink
boost
Browse files Browse the repository at this point in the history
  • Loading branch information
dxli committed Aug 27, 2023
1 parent a723789 commit 4708118
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if(MSVC)
include_directories(${glm_INCLUDE_DIR})
add_definitions("/bigobj")
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " /w /wd4710 /wd4711 /wd4668 /wd5045 /wd9002 /wd4365 /wd4242 /wd9002 /wd9014 /wd9025")
SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " /w /wd4710 /wd4711 /wd4668 /wd5045 /wd9002 /wd4365 /wd4242")
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} " /w /wd4710 /wd4711")
# Kaguya uses a pointer to a local variable (in object.hpp file) to store class conversions.
# When used in different modules, the variable doesn't have the same address, preventing to mix kernel and UI bindings
Expand Down
4 changes: 2 additions & 2 deletions lckernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ cad/objects/pattern.h
)

# Boost logging
find_package(Boost REQUIRED COMPONENTS log)
find_package(Boost REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

Expand Down Expand Up @@ -279,7 +279,7 @@ add_library(lckernel SHARED ${lckernel_srcs} ${lckernel_hdrs})
target_link_libraries(lckernel ${Boost_LIBRARIES} ${APR_LIBRARIES} ${G_EXTRA_LIBS} tinysplinecxx)

if (MSVC)
target_link_libraries(lckernel Boost::log)
target_link_libraries(lckernel Boost::log Boost::log_setup)
endif()

# INSTALLATION
Expand Down

0 comments on commit 4708118

Please sign in to comment.