diff options
Diffstat (limited to 'indra/cmake/MySQL.cmake')
| -rw-r--r-- | indra/cmake/MySQL.cmake | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e591fbc3d8..e124ebb45e 100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake @@ -1,20 +1,14 @@ # -*- cmake -*- include(Linking) include(Prebuilt) +# We don't prebuild our own MySQL client library. use_prebuilt_binary(mysql) -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_FIND_QUIETLY ON) +set(MYSQL_FIND_REQUIRED ON) + +if (WINDOWS) set(MYSQL_LIBRARIES mysqlclient) set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) elseif (DARWIN) @@ -23,4 +17,7 @@ elseif (DARWIN) optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a ) -endif (LINUX) +else (WINDOWS) + set(MYSQL_FIND_REQUIRED) + include(FindMySQL) +endif (WINDOWS) |