diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2008-10-10 16:04:02 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2008-10-10 16:04:02 +0000 |
| commit | 5f3875018ee9977917d6fff5f2c2cf87db41ce3e (patch) | |
| tree | 63ae291bed617d557b5c745a614a2e1cf21e9469 /indra/cmake | |
| parent | 4ff16b735f59326514ad92ec38e3261cd996e05c (diff) | |
svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 05aefaf522..25e9f6d4f4 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -19,6 +19,10 @@ if (GOOGLE_PERFTOOLS_FOUND) set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.") endif (GOOGLE_PERFTOOLS_FOUND) +# XXX Disable temporarily, until we have compilation issues on 64-bit +# Etch sorted. +set(USE_GOOGLE_PERFTOOLS OFF) + if (USE_GOOGLE_PERFTOOLS) set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index a02b5d958e..f103dcf664 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -5,8 +5,6 @@ if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu) use_prebuilt_binary(kdu) if (WINDOWS) set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - elseif (LINUX) - set(KDU_LIBRARY kdu_v42R) else (WINDOWS) set(KDU_LIBRARY kdu) endif (WINDOWS) |