mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 22:07:50 +08:00
ca1e2ec6b3
* [spdlog]Upgrade version to 1.4.2 * [spdlog]Do not remove these libraries. * [spdlog]Fix error C4275 when use fmt. * [spdlog]Re-fix C4275 error. * [spdlog]Re-fix C4275 error. * [spdlog]Disable build on uwp. * [spdlog]Fix build with uwp.
20 lines
692 B
Diff
20 lines
692 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 12320fb..70f611b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -33,13 +33,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
|
# Set SPDLOG_MASTER_PROJECT to ON if we are building spdlog
|
|
#---------------------------------------------------------------------------------------
|
|
# Check if spdlog is being used directly or via add_subdirectory, but allow overriding
|
|
-if (NOT DEFINED SPDLOG_MASTER_PROJECT)
|
|
- if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
|
|
- set(SPDLOG_MASTER_PROJECT ON)
|
|
- else()
|
|
- set(SPDLOG_MASTER_PROJECT OFF)
|
|
- endif()
|
|
-endif ()
|
|
+set(SPDLOG_MASTER_PROJECT OFF)
|
|
|
|
# build shared option
|
|
if(NOT WIN32)
|