diff options
author | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
commit | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch) | |
tree | fb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/cmake/MySQL.cmake | |
parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) |
merge changes for 3.5.1-release
Diffstat (limited to 'indra/cmake/MySQL.cmake')
-rw-r--r-- | indra/cmake/MySQL.cmake | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake deleted file mode 100644 index 218482449d..0000000000 --- a/indra/cmake/MySQL.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# -*- cmake -*- -include(Linking) -include(Prebuilt) - -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}/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}/include) -elseif (DARWIN) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - set(MYSQL_LIBRARIES - optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a - debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a - ) -endif (LINUX) |