diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-04-09 18:05:56 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-04-09 18:05:56 +0000 |
| commit | 1aca3ff6f5f6ce0d2414d4266e902ba40f4c8d84 (patch) | |
| tree | 46dc3bc3dd068e9849014deb801c974df92fc532 /indra/cmake/MySQL.cmake | |
| parent | fa121d8ee18978ffc25e9faeffcfa1d7c6e1592e (diff) | |
Get 32-bit builds going on 64-bit Debian Etch.
Reviewed by Brad.
Diffstat (limited to 'indra/cmake/MySQL.cmake')
| -rw-r--r-- | indra/cmake/MySQL.cmake | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e124ebb45e..e591fbc3d8 100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake @@ -1,14 +1,20 @@ # -*- cmake -*- include(Linking) include(Prebuilt) -# We don't prebuild our own MySQL client library. use_prebuilt_binary(mysql) -set(MYSQL_FIND_QUIETLY ON) -set(MYSQL_FIND_REQUIRED ON) - -if (WINDOWS) +if (LINUX) + if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") + set(MYSQL_LIBRARIES mysqlclient) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") + # Use the native MySQL library on a 64-bit system. + set(MYSQL_FIND_QUIETLY ON) + set(MYSQL_FIND_REQUIRED ON) + include(FindMySQL) + endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1") +elseif (WINDOWS) set(MYSQL_LIBRARIES mysqlclient) set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) elseif (DARWIN) @@ -17,7 +23,4 @@ elseif (DARWIN) optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a ) -else (WINDOWS) - set(MYSQL_FIND_REQUIRED) - include(FindMySQL) -endif (WINDOWS) +endif (LINUX) |