diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLConvexDecomposition.cmake | 10 | ||||
| -rw-r--r-- | indra/cmake/LLPathingLib.cmake | 23 |
2 files changed, 28 insertions, 5 deletions
diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake index 8e44504782..1731853300 100644 --- a/indra/cmake/LLConvexDecomposition.cmake +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -3,10 +3,10 @@ include(Prebuilt) set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llconvexdecomposition) - set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -else (INSTALL_PROPRIETARY AND NOT STANDALONE) +# 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) +# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake new file mode 100644 index 0000000000..8e622d83db --- /dev/null +++ b/indra/cmake/LLPathingLib.cmake @@ -0,0 +1,23 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(llpathinglib) +set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) + + +set(LLPATHING_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +set(LLPATHING_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) + +find_library(LL_PATHING_DEBUG_LIB llpathinglib PATHS ${LLPATHING_DEBUG_LIBRARY_PATH}) +find_library(LL_PATHING_RELEASE_LIB llpathinglib PATHS ${LLPATHING_RELEASE_LIBRARY_PATH}) + +set(LLPATHING_LIBRARIES + + debug ${LL_PATHING_DEBUG_LIB} + optimized ${LL_PATHING_RELEASE_LIB} +) + +if (LINUX) + list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPATHING_LIBRARIES -Wl,--end-group) +endif (LINUX) |