diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-28 08:29:18 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 08:29:18 +0800 |
| commit | 8686e3d6f1cff12fd252c705411c10f62e988e76 (patch) | |
| tree | 369c0e6a8b77637c5c39e732bcc0c14fcc20713e | |
| parent | 630a1197d219e57098236913bbd464d6b03f2a6d (diff) | |
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.
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 6 |
1 files 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) |