cmake / move FetchContent spdlog to a single place
This commit is contained in:
		| @@ -251,7 +251,12 @@ if (USE_WS OR USE_TEST) | |||||||
|   add_subdirectory(ixsentry) |   add_subdirectory(ixsentry) | ||||||
|   add_subdirectory(ixbots) |   add_subdirectory(ixbots) | ||||||
|  |  | ||||||
|   # add_subdirectory(third_party/spdlog spdlog) |   include(FetchContent) | ||||||
|  |   FetchContent_Declare(spdlog | ||||||
|  |       GIT_REPOSITORY "https://github.com/gabime/spdlog" | ||||||
|  |       GIT_TAG "v1.8.0")  | ||||||
|  |  | ||||||
|  |   FetchContent_MakeAvailable(spdlog) | ||||||
|  |  | ||||||
|   if (USE_WS) |   if (USE_WS) | ||||||
|       add_subdirectory(ws) |       add_subdirectory(ws) | ||||||
|   | |||||||
| @@ -2,18 +2,11 @@ | |||||||
| # Author: Benjamin Sergeant | # Author: Benjamin Sergeant | ||||||
| # Copyright (c) 2018 Machine Zone, Inc. All rights reserved. | # Copyright (c) 2018 Machine Zone, Inc. All rights reserved. | ||||||
| # | # | ||||||
| cmake_minimum_required (VERSION 3.4.1) | cmake_minimum_required (VERSION 3.14) | ||||||
| project (ixwebsocket_unittest) | project (ixwebsocket_unittest) | ||||||
|  |  | ||||||
| set (CMAKE_CXX_STANDARD 14) | set (CMAKE_CXX_STANDARD 14) | ||||||
|  |  | ||||||
| include(FetchContent) |  | ||||||
| FetchContent_Declare(spdlog |  | ||||||
|     GIT_REPOSITORY "https://github.com/gabime/spdlog" |  | ||||||
|     GIT_TAG "v1.8.0")  |  | ||||||
|  |  | ||||||
| FetchContent_MakeAvailable(spdlog) |  | ||||||
|  |  | ||||||
| option(USE_TLS "Add TLS support" ON) | option(USE_TLS "Add TLS support" ON) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|   | |||||||
| @@ -16,13 +16,6 @@ endif() | |||||||
|  |  | ||||||
| set (CMAKE_CXX_STANDARD 14) | set (CMAKE_CXX_STANDARD 14) | ||||||
|  |  | ||||||
| include(FetchContent) |  | ||||||
| FetchContent_Declare(spdlog |  | ||||||
|     GIT_REPOSITORY "https://github.com/gabime/spdlog" |  | ||||||
|     GIT_TAG "v1.8.0")  |  | ||||||
|  |  | ||||||
| FetchContent_MakeAvailable(spdlog) |  | ||||||
|  |  | ||||||
| option(USE_TLS "Add TLS support" ON) | option(USE_TLS "Add TLS support" ON) | ||||||
|  |  | ||||||
| include_directories(ws .) | include_directories(ws .) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user