From 8686e3d6f1cff12fd252c705411c10f62e988e76 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 28 Jul 2024 08:29:18 +0800 Subject: Finally stop compiling lldaeloader.cpp with C++14 Quite amazing how it could get away this far having a vanilla Collada DOM up until this point, where now there would be just too many C++17 features that the lldaeloader.cpp alone would have to avoid. So we finally have to compromise now, and you'll need to replace auto_ptr in your Collada DOM installation's dae.h with unique_ptr. That's it, though. --- indra/llprimitive/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 9d02a1fa4c..dea85f8f4f 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -74,10 +74,8 @@ target_link_libraries(llprimitive ll::glh_linear ) -if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) - set_source_files_properties(lldaeloader.cpp PROPERTIES COMPILE_FLAGS - -std=c++14) - add_subdirectory(llphysicsextensions) +if (USESYSTEMLIBS) + add_subdirectory(llphysicsextensions) endif () include(LibraryInstall) -- cgit v1.2.3