diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-21 08:47:36 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-21 08:47:36 -0700 |
| commit | 42cc602732824df9af239de3b5d7ba05b5797106 (patch) | |
| tree | 221f4965ecfda5b013d7828598f24739a89712b4 /indra | |
| parent | 12b1ec62645e772174cd710a208f59ab823eafe0 (diff) | |
fix finding havok libs in relwithdebinfo mode (uses release unless LL_DEBUG_HAVOK is used
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Havok.cmake | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 49b348e9f7..5c0768abfa 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -7,13 +7,16 @@ list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) -if (LL_DEBUG_HAVOK AND NOT WIN32) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) -else (LL_DEBUG_HAVOK AND NOT WIN32) - # Always link relwithdebinfo to havok-hybrid on windows. - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) -endif (LL_DEBUG_HAVOK AND NOT WIN32) - +if (LL_DEBUG_HAVOK) + if (WIN32) + # Always link relwithdebinfo to havok-hybrid on windows. + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) + else (WIN32) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) + endif (WIN32) +else (LL_DEBUG_HAVOK) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) +endif (LL_DEBUG_HAVOK) set(HAVOK_LIBS hkBase |