diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-01-26 14:06:57 -0800 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-26 14:06:57 -0800 |
commit | 1c14b084569d6482d25d6ea2c29dae716cd1d7f7 (patch) | |
tree | ff7c78e406bc3879220f44a9886ed8adb6171b56 /indra/cmake/LLPhysicsExtensions.cmake | |
parent | ee1a6c9afdd789a29e6f920cab47fa0129a6a7a3 (diff) |
PATH-181 and PATH-194: Starting to put back the ability to build the viewer using the stub libraries.
Diffstat (limited to 'indra/cmake/LLPhysicsExtensions.cmake')
-rw-r--r-- | indra/cmake/LLPhysicsExtensions.cmake | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 598ac72849..81493dfdff 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,31 +1,25 @@ # -*- cmake -*- include(Prebuilt) -use_prebuilt_binary(llphysicsextensions) 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) + use_prebuilt_binary(llphysicsextensions) -find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) + set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) + set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -set(LLPHYSICS_LIBRARIES + find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) + find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) - debug ${LL_PHYSICS_DEBUG_LIB} - optimized ${LL_PHYSICS_RELEASE_LIB} -) - -if (LINUX) - list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) -endif (LINUX) - -# if (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecomposition) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -# else (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecompositionstub) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + set(LLPHYSICS_LIBRARIES + debug ${LL_PHYSICS_DEBUG_LIB} + optimized ${LL_PHYSICS_RELEASE_LIB} + ) + if (LINUX) + list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) + endif (LINUX) +else (INSTALL_PROPRIETARY AND NOT STANDALONE) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) |