diff options
| author | Armin Weatherwax | 2010-01-01 12:59:25 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-01-03 16:31:44 -0600 |
| commit | 6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e (patch) | |
| tree | bac0122928909ec635f62d8daf0bdb368750f7c0 /linden/indra/cmake | |
| parent | Updating a few 64bit Linux libs. (diff) | |
| download | meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.zip meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.tar.gz meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.tar.bz2 meta-impy-6d50eb4a8c4e6cd4a25f9b5561ad9042814ac89e.tar.xz | |
Fix just another hardcoded path to Linux-i686.
(Cherry picked by Jacek from 2e96ac24)
Diffstat (limited to 'linden/indra/cmake')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 49fdb5b..355ce45 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
| @@ -168,6 +168,9 @@ if (LINUX) | |||
| 168 | # this stops us requiring a really recent glibc at runtime | 168 | # this stops us requiring a really recent glibc at runtime |
| 169 | add_definitions(-fno-stack-protector) | 169 | add_definitions(-fno-stack-protector) |
| 170 | endif (NOT STANDALONE) | 170 | endif (NOT STANDALONE) |
| 171 | if (${ARCH} STREQUAL "x86_64") | ||
| 172 | add_definitions( -DLINUX64=1 ) | ||
| 173 | endif (${ARCH} STREQUAL "x86_64") | ||
| 171 | endif (VIEWER) | 174 | endif (VIEWER) |
| 172 | 175 | ||
| 173 | set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") | 176 | set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") |