diff options
| author | Nicky Dasmijn <nicky.dasmijn@posteo.nl> | 2022-09-17 11:21:06 +0200 |
|---|---|---|
| committer | Nicky Dasmijn <nicky.dasmijn@posteo.nl> | 2022-09-17 11:21:06 +0200 |
| commit | 68c680599b3ee038a33bcad36ac52912725cf3cd (patch) | |
| tree | 22ded8c7e702d630ab08464b385cb584b0c45c1b /indra | |
| parent | 31341ac605f3f1ae24568af3e09b200daef77b8f (diff) | |
Try to make sure this also works with the havok version of llphysicsextension.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LLPhysicsExtensions.cmake | 10 | ||||
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 9c628b84b1..36821447c9 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -11,7 +11,7 @@ if (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY) include_guard() -add_library( llphysicsextensions INTERFACE IMPORTED ) +add_library( llphysicsextensions_impl INTERFACE IMPORTED ) # Note that the use_prebuilt_binary macros below do not in fact include binaries; @@ -22,14 +22,14 @@ if (HAVOK) include(Havok) use_prebuilt_binary(llphysicsextensions_source) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) - target_link_libraries( llphysicsextensions INTERFACE llphysicsextensions) + target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions) elseif (HAVOK_TPV) use_prebuilt_binary(llphysicsextensions_tpv) - target_link_libraries( llphysicsextensions INTERFACE llphysicsextensions_tpv) + target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions_tpv) else (HAVOK) use_prebuilt_binary(llphysicsextensions_stub) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) - target_link_libraries( llphysicsextensions INTERFACE llphysicsextensionsstub) + target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensionsstub) endif (HAVOK) -target_include_directories( llphysicsextensions INTERFACE ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) +target_include_directories( llphysicsextensions_impl INTERFACE ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index bf35500bad..7d83dc77c1 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -60,7 +60,7 @@ target_link_libraries(llprimitive llcorehttp llxml llcharacter - llphysicsextensions + llphysicsextensions_impl ll::colladadom ll::pcre ll::glh_linear diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2ad40faa37..74faf3d1b6 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -61,7 +61,12 @@ if (NOT HAVOK_TPV) # Another hack that works with newer cmake versions: cmake_policy( SET CMP0079 NEW) - target_link_libraries(llphysicsextensionsstub llcommon llmath) + if( TARGET llphysicsextensionsstub ) + target_link_libraries(llphysicsextensionsstub llcommon llmath) + endif() + if( TARGET llphysicsextensions ) + target_link_libraries(llphysicsextensions llrender ) + endif() endif (NOT HAVOK_TPV) |