diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-27 15:11:19 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-27 15:11:19 -0500 |
| commit | de468db614a26ba1d8706a3448cf840d938a8d5b (patch) | |
| tree | 09eca006a7ecd148cd80d4fb6216893b5f636a6b /indra/cmake | |
| parent | f304b18a74c8d3ae92d2298845e1c9f4f248e11a (diff) | |
| parent | f19a77047d10eca2bff07891375b7859b9e68e99 (diff) | |
Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLPhysicsExtensions.cmake | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 0ab57e48db..73d5dd59cf 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,22 +1,24 @@ # -*- cmake -*- include(Prebuilt) -use_prebuilt_binary(llphysicsextensions) +if (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llphysicsextensions) + set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensions) +else (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llphysicsextensionsstub) + set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensionsstub) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - set(LL_PHYSICS_LIB_NAME "llphysicsextensions") -else (INSTALL_PROPRIETARY AND NOT STANDALONE) - set(LL_PHYSICS_LIB_NAME "llphysicsextensionsstub") -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) - -find_library(LL_PHYSICS_DEBUG_LIB ${LL_PHYSICS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB ${LL_PHYSICS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) +find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) +find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) set(LLPHYSICS_LIBRARIES + debug ${LL_PHYSICS_DEBUG_LIB} optimized ${LL_PHYSICS_RELEASE_LIB} ) |