diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-07-11 16:56:16 +0800 | 
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-07-19 10:49:11 +0800 | 
| commit | 45b9eed30320c6281efcfb748098a8789b15f15f (patch) | |
| tree | b286fd3de2294658be0bbca8042551bb4fd69f8d /indra/newview | |
| parent | d7a2947c4f24726df622749fa45b9306d1ed43e8 (diff) | |
LL physics extensions stub
Since the CMakeLists.txt includes some same .cmake files as the viewer,
I think the project might as well be a part of the Linden libraries
code. And for now is put under llprimitive (might not be consistent, in
fact the opposite, with they way llplugin relates to slplugin), but I
think this way results the least change, and it still works.
The differences include:
- all files (common llphysicsextensions headers to be included by
  library users and the stub implementation files) are put inside one
  directory, and the CMakeLists.txt is adjusted accordingly;
- modernised CMakeLists.txt, so include_directories are now implied by
  target_link_libraries;
- some file name fix;
- add_library is not explicitly set to STATIC;
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index dbd1f1b4ac..1c095ec548 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -47,7 +47,7 @@ include(ZLIBNG)  include(URIPARSER)  include(LLPrimitive) -if (NOT HAVOK_TPV) +if ((USE_AUTOBUILD_3P OR USE_CONAN) AND NOT HAVOK_TPV)     # When using HAVOK_TPV, the library is precompiled, so no need for this     # Stub and probably havok lib itself is a hack, autobuild loads a 3p that really is a source tarball @@ -68,7 +68,7 @@ if (NOT HAVOK_TPV)          target_compile_options( llphysicsextensions  PRIVATE -Wno-unused-local-typedef)        endif (DARWIN)     endif() -endif (NOT HAVOK_TPV) +endif ((USE_AUTOBUILD_3P OR USE_CONAN) AND NOT HAVOK_TPV)  set(viewer_SOURCE_FILES  | 
