Skip to content

Commit

Permalink
Merge pull request #35 from Shareong/main
Browse files Browse the repository at this point in the history
fix uuid
  • Loading branch information
Shareong authored Mar 14, 2024
2 parents f7c61d5 + e827932 commit 67b4adc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
10 changes: 0 additions & 10 deletions cmake/CompilerSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,6 @@ if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR("${CMAKE_CXX_COMPILER_ID}" MATC
add_compile_options(-fstack-protector)
add_compile_options(-Winconsistent-missing-override)
add_compile_options(-foptimize-sibling-calls)

# Some Linux-specific Clang settings. We don't want these for OS X.
if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# Tell Boost that we're using Clang's libc++. Not sure exactly why we need to do.
add_definitions(-DBOOST_ASIO_HAS_CLANG_LIBCXX)
# Fix for Boost UUID on old kernel version Linux. See https://github.com/boostorg/uuid/issues/91
add_definitions(-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX)
# Use fancy colors in the compiler diagnostics
add_compile_options(-fcolor-diagnostics)
endif()
endif()

if(SANITIZE_ADDRESS)
Expand Down
3 changes: 2 additions & 1 deletion vcpkg-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"baseline": "3765dfb347d9fc820cfad9005b2f87d0755895ec",
"packages": [
"tbb",
"boost-beast"
"boost-beast",
"boost-uuid"
]
}
]
Expand Down

0 comments on commit 67b4adc

Please sign in to comment.