diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
commit | bad06f68fc3122b5b83f21f1fa8bc7e7ec53bfc8 (patch) | |
tree | cdf1bdc9f6c665eba22645ce4a1fdf7c34d55321 /indra/cmake/MySQL.cmake | |
parent | 211d1dfb770aa029d77cd231815a5848640b54a6 (diff) | |
parent | af8c2bc94868e056908b4ae2fc285925cd68b56b (diff) |
Merge. Refresh from viewer-release merged with in-progress work.
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) |