diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-08 11:41:12 -0400 |
| commit | 375c05ac43ed56c8ad9670dfdfc801085075a2a2 (patch) | |
| tree | 2dcee4ef5757823430d5e234e23eedb1a3354d19 /indra/cmake | |
| parent | a60875e549aa90f1cef450aabaf23570cf20a22e (diff) | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
merge changes for 3.7.5-release
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/FMODEX.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/GoogleBreakpad.cmake | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 44c2d3ac27..f98e88b697 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -64,6 +64,7 @@ if(WINDOWS) endif(USE_TCMALLOC) if (FMODEX) + set(debug_files ${debug_files} fmodexL.dll) set(release_files ${release_files} fmodex.dll) endif (FMODEX) @@ -294,7 +295,8 @@ elseif(LINUX) endif (USE_TCMALLOC) if (FMODEX) - set(release_file ${release_files} "libfmodex.so") + set(debug_files ${debug_files} "libfmodexL.so") + set(release_files ${release_files} "libfmodex.so") endif (FMODEX) else(WINDOWS) diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake index 65bc1cabeb..163260137b 100644 --- a/indra/cmake/FMODEX.cmake +++ b/indra/cmake/FMODEX.cmake @@ -39,7 +39,7 @@ if (FMODEX) optimized fmodex) endif (WINDOWS) set(FMODEX_LIBRARIES ${FMODEX_LIBRARY}) - set(FMODEX_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodex) + set(FMODEX_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/) endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR) endif (STANDALONE) endif (FMODEX) diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake index 96e22791ec..7f9ba4ea8e 100755 --- a/indra/cmake/GoogleBreakpad.cmake +++ b/indra/cmake/GoogleBreakpad.cmake @@ -13,7 +13,7 @@ else (STANDALONE) set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES breakpad_client) endif (LINUX) if (WINDOWS) - set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client common) + set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client crash_generation_server common) endif (WINDOWS) # yes, this does look dumb, no, it's not incorrect # |