Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ option_if_not_defined(LSPCPP_ASAN "Build lsp with address sanitizer" OFF)
option_if_not_defined(LSPCPP_MSAN "Build lsp with memory sanitizer" OFF)
option_if_not_defined(LSPCPP_TSAN "Build lsp with thread sanitizer" OFF)
option_if_not_defined(LSPCPP_INSTALL "Create lsp install target" OFF)
option_if_not_defined(LSPCPP_STANDALONE_ASIO "Use standalone asio" OFF)
option_if_not_defined(LSPCPP_STANDALONE_ASIO "Use standalone asio" ON)
option_if_not_defined(LSPCPP_SUPPORT_BOEHM_GC "\
Enable support for Boehm GC. GC must be specified LSPCPP_GC_DOWNLOADED_ROOT, if downloaded or by
find_package(BDWgc CONFIG REQUIRED) or pkg_config." OFF)
Expand Down Expand Up @@ -378,7 +378,7 @@ if (NOT LSPCPP_STANDALONE_ASIO)
INSTALL_NUGET(boost_system-vc141 1.76.0.0)
INSTALL_NUGET(boost_thread-vc141 1.76.0.0)
else ()
find_package(Boost REQUIRED)
find_package(Boost CONFIG)
if (NOT Boost_FOUND)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
message(FATAL_ERROR "Can't find boost,lease build boost and install it or install boost with : brew install boost")
Expand Down
17 changes: 11 additions & 6 deletions support/cmake/distclean.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cmake_minimum_required(VERSION 3.15)

# This CMake script will delete build directories and files to bring the
# package back to it's distribution state

Expand Down Expand Up @@ -47,10 +49,10 @@ FILE(GLOB TOPDIRECTORIES "${TOPDIR}/lib"
FILE(GLOB_RECURSE LIB "${TOPDIR}/*.a")
FILE(GLOB_RECURSE OBJ "${TOPDIR}/*.cpp.o")

# CMake has trouble finding directories recursively, so locate these
# files and then save the parent directory of the files
GET_PARENT_DIRECTORIES(Makefile.cmake CMAKEFILES 0)
GET_PARENT_DIRECTORIES(LastTest.log CMAKETESTING 1)
# Delete CMakeFiles directories (specific to this project)
FILE(GLOB CMAKEFILES "${TOPDIR}/CMakeFiles")
FILE(GLOB CMAKEFILES_NESTED "${TOPDIR}/*/CMakeFiles")
FILE(GLOB CMAKEFILES_NESTED_NESTED "${TOPDIR}/*/*/CMakeFiles")

# Place these files and directories into a list
SET(DEL ${TOPDIRECTORIES}
Expand All @@ -66,11 +68,14 @@ SET(DEL ${TOPDIRECTORIES}
${CMAKECACHE}
${CMAKEINSTALL}
${MAKEFILE}
${CMAKEFILES}
${CMAKETESTING}
${CMAKETESTFILES}
${CMAKEFILES}
${CMAKEFILES_NESTED}
${CMAKEFILES_NESTED_NESTED}
)



# If we are not in the build dir, delete that as well
IF(NOT (${BASEDIR} STREQUAL "build"))
FILE(GLOB BUILD "${TOPDIR}/build")
Expand Down
5 changes: 0 additions & 5 deletions third_party/asio/src/doc/.gitignore

This file was deleted.

81 changes: 0 additions & 81 deletions third_party/asio/src/doc/Jamfile.v2

This file was deleted.

Binary file removed third_party/asio/src/doc/asio.png
Binary file not shown.
142 changes: 0 additions & 142 deletions third_party/asio/src/doc/asio.qbk

This file was deleted.

90 changes: 0 additions & 90 deletions third_party/asio/src/doc/asioref.sty

This file was deleted.

Loading
Loading