diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2011-12-14 15:20:15 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2011-12-14 15:20:15 -0800 |
| commit | a9233d4f5c4a0f7b4225a7e6dbc02c024eea7cd9 (patch) | |
| tree | d594abdeb6eeefede314e16a288b495b464a87cf /indra/cmake/LLPathingLib.cmake | |
| parent | 4f5fc4921ff35cc12568eebc36e0318efbd34068 (diff) | |
Ensuring that the debug build use the debug libs and the release build use the release libs.
Diffstat (limited to 'indra/cmake/LLPathingLib.cmake')
| -rw-r--r-- | indra/cmake/LLPathingLib.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake index b92190ad0a..c108b33e8c 100644 --- a/indra/cmake/LLPathingLib.cmake +++ b/indra/cmake/LLPathingLib.cmake @@ -3,14 +3,16 @@ include(Prebuilt) use_prebuilt_binary(llpathinglib) set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) -if (CMAKE_BUILD_TYPE MATCHES "Debug") - set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -else (CMAKE_BUILD_TYPE MATCHES "Debug") - set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -endif (CMAKE_BUILD_TYPE MATCHES "Debug") -find_library(LL_PATHING_LIB llpathinglib PATHS ${LLPATHING_LIBRARY_PATH}) + +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 - ${LL_PATHING_LIB} + + debug ${LL_PATHING_DEBUG_LIB} + optimized ${LL_PATHING_RELEASE_LIB} ) |