From c55472536dd939caf1e2ed53a80397fd6680335d Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Sun, 29 Oct 2023 20:07:55 -0500 Subject: [PATCH] Tweak SPDLOG build settings --- 3rdparty/CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 10d65341..13c9a0c2 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -170,17 +170,6 @@ SET(NEWTON_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE) SET(NEWTON_USE_PLUGIN_DLL OFF CACHE BOOL "" FORCE) SET(NEWTON_WITH_AVX_PLUGIN OFF CACHE BOOL "" FORCE) SET(NEWTON_WITH_REFERENCE_GPU_PLUGIN OFF CACHE BOOL "" FORCE) - -# Work around bug in newton cmake. -# Fix merged upstream, waiting for tag: https://github.com/MADEAPPS/newton-dynamics/pull/281 -if(NOT CMAKE_VS_PLATFORM_NAME) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") - set(CMAKE_VS_PLATFORM_NAME "x64") - else() - set(CMAKE_VS_PLATFORM_NAME "Win32") - endif() -endif() - ADD_SUBDIRECTORY(newton-dynamics/newton-3.14/ EXCLUDE_FROM_ALL) # Newton sets CMAKE_ARCHIVE_OUTPUT_DIRECTORY and CMAKE_LIBRARY_OUTPUT_DIRECTORY @@ -194,6 +183,9 @@ ADD_SUBDIRECTORY(entt EXCLUDE_FROM_ALL) SET(toml11_INSTALL OFF CACHE BOOL "" FORCE) ADD_SUBDIRECTORY(toml11 EXCLUDE_FROM_ALL) + +SET(SPDLOG_ENABLE_PCH TRUE) +SET(SPDLOG_USE_STD_FORMAT TRUE) ADD_SUBDIRECTORY(spdlog EXCLUDE_FROM_ALL) ADD_SUBDIRECTORY(longeronpp EXCLUDE_FROM_ALL)