diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:15:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:15:06 -0500 |
| commit | 0a262969e1da82fc95ec889f7aaafa4078bcf480 (patch) | |
| tree | 7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/cmake/MySQL.cmake | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
| parent | c1901890576d3b9442846c8890b1724438eab46e (diff) | |
Automated merge with file:///Users/oz/Work/V-DR
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 |