diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-25 17:11:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-25 17:11:56 -0500 |
| commit | 8b2b0ba2df1f21490f6cf454a5f62cf5f7b4f833 (patch) | |
| tree | 3fefa4114242238bbc97bd16c506ee9e9e405e07 /indra/cmake/MySQL.cmake | |
| parent | 714ba52df0397b58769e02ae9a7d9877a4505d34 (diff) | |
| parent | 93138ec2cbd5a9707a7ade1acc6ef35fbc50b422 (diff) | |
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/cmake/MySQL.cmake')
| -rw-r--r-- | indra/cmake/MySQL.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake index e591fbc3d8..218482449d 100644 --- a/indra/cmake/MySQL.cmake +++ b/indra/cmake/MySQL.cmake @@ -7,7 +7,7 @@ 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) + 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) @@ -16,9 +16,9 @@ if (LINUX) 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) + set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) elseif (DARWIN) - set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) + 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 |