diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:28:15 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:28:15 -0400 |
| commit | 008dd95f70a53335f7979e553f7178dfce2565ab (patch) | |
| tree | 3225891d5cfadb66f761de37a6ec8f85ca6ac751 /CMakeLists.txt | |
| parent | 4e95179af9c2f2589093ea9f94472d8d047892c7 (diff) | |
| parent | 09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff) | |
| download | mariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz | |
Auto-merge
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aacfe8e382..0b8acba33a7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR) +IF(COMMAND cmake_policy) + cmake_policy(SET CMP0005 NEW) +ENDIF(COMMAND cmake_policy) PROJECT(MySql) @@ -28,6 +31,13 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in # Set standard options ADD_DEFINITIONS(-DHAVE_YASSL) +ADD_DEFINITIONS(-DCMAKE_CONFIGD) +ADD_DEFINITIONS(-DDEFAULT_MYSQL_HOME="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/") +ADD_DEFINITIONS(-DDEFAULT_BASEDIR="c:/Program Files/MySQL/") +ADD_DEFINITIONS(-DMYSQL_DATADIR="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/data") +ADD_DEFINITIONS(-DDEFAULT_CHARSET_HOME="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/") +ADD_DEFINITIONS(-DPACKAGE=mysql) +ADD_DEFINITIONS(-DSHAREDIR="share") # Set debug options SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") |