diff options
| author | Armin Weatherwax | 2010-03-12 12:09:52 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-03-13 01:29:23 -0600 |
| commit | 95a188ad394084667b5b186cef467b0473645603 (patch) | |
| tree | db378f450002acb16f8ee12f83f832693fccbe25 /linden/indra/cmake/ELFIO.cmake | |
| parent | Fixed a small mistake in Linux stack trace formatting. (diff) | |
| download | meta-impy-95a188ad394084667b5b186cef467b0473645603.zip meta-impy-95a188ad394084667b5b186cef467b0473645603.tar.gz meta-impy-95a188ad394084667b5b186cef467b0473645603.tar.bz2 meta-impy-95a188ad394084667b5b186cef467b0473645603.tar.xz | |
Reactivated libELFIO for Linux64 (it wasn't causing the crash).
(Reverts part of commit 30945b74.)
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/ELFIO.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/cmake/ELFIO.cmake b/linden/indra/cmake/ELFIO.cmake index 4f19ecd..0d376bf 100644 --- a/linden/indra/cmake/ELFIO.cmake +++ b/linden/indra/cmake/ELFIO.cmake | |||
| @@ -6,14 +6,14 @@ set(ELFIO_FIND_QUIETLY ON) | |||
| 6 | if (STANDALONE) | 6 | if (STANDALONE) |
| 7 | include(FindELFIO) | 7 | include(FindELFIO) |
| 8 | elseif (LINUX) | 8 | elseif (LINUX) |
| 9 | if (${ARCH} STREQUAL "x86_64") | 9 | # if (${ARCH} STREQUAL "x86_64") |
| 10 | set(ELFIO_FOUND "NO") | 10 | # set(ELFIO_FOUND "NO") |
| 11 | else (${ARCH} STREQUAL "x86_64") | 11 | # else (${ARCH} STREQUAL "x86_64") |
| 12 | use_prebuilt_binary(elfio) | 12 | use_prebuilt_binary(elfio) |
| 13 | set(ELFIO_LIBRARIES ELFIO) | 13 | set(ELFIO_LIBRARIES ELFIO) |
| 14 | set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) | 14 | set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) |
| 15 | set(ELFIO_FOUND "YES") | 15 | set(ELFIO_FOUND "YES") |
| 16 | endif (${ARCH} STREQUAL "x86_64") | 16 | # endif (${ARCH} STREQUAL "x86_64") |
| 17 | endif (STANDALONE) | 17 | endif (STANDALONE) |
| 18 | 18 | ||
| 19 | if (ELFIO_FOUND) | 19 | if (ELFIO_FOUND) |