Skip to content

Commit

Permalink
Updated minimum boost requirement on CMakeLists.txt.
Browse files Browse the repository at this point in the history
Since Boost 1.66.0, Beast is a part of Boost.
So I removed Beast git submodule.
  • Loading branch information
redboltz committed Sep 10, 2019
1 parent 49a3eeb commit 42b52f9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,3 +0,0 @@
[submodule "external/beast"]
path = external/beast
url = https://github.com/boostorg/beast.git
11 changes: 2 additions & 9 deletions CMakeLists.txt
Expand Up @@ -96,22 +96,15 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
ENDIF ()

SET (Boost_USE_MULTITHREADED ON)
FIND_PACKAGE (Boost 1.59.0 REQUIRED COMPONENTS system)
FIND_PACKAGE (Boost 1.66.0 REQUIRED COMPONENTS system)
FIND_PACKAGE (Threads)

IF(MQTT_BUILD_TESTS)
FIND_PACKAGE (Boost 1.59.0 REQUIRED COMPONENTS chrono timer unit_test_framework)
FIND_PACKAGE (Boost 1.66.0 REQUIRED COMPONENTS chrono timer unit_test_framework)
ENDIF()

IF (NOT MQTT_BEAST_INCLUDE_DIR)
IF (${Boost_VERSION} LESS 106600)
SET (MQTT_BEAST_INCLUDE_DIR "external/beast/include")
ENDIF ()
ENDIF ()

INCLUDE_DIRECTORIES (
${Boost_INCLUDE_DIR}
${MQTT_BEAST_INCLUDE_DIR}
include
)

Expand Down
1 change: 0 additions & 1 deletion external/beast
Submodule beast deleted from 9dc9ca

0 comments on commit 42b52f9

Please sign in to comment.