diff options
| author | unknown <reggie@big_geek.> | 2006-03-27 15:19:56 -0600 |
|---|---|---|
| committer | unknown <reggie@big_geek.> | 2006-03-27 15:19:56 -0600 |
| commit | a242edb454f94fc567d52506873f568cfc0c100f (patch) | |
| tree | 148837db9e4d998afbe71c07ee36b5f6608f8191 /cmakelists.txt | |
| parent | 212e79136ba2a6d8ac48ea85492ef7fbc5782ee0 (diff) | |
| download | mariadb-git-a242edb454f94fc567d52506873f568cfc0c100f.tar.gz | |
removed handlerton-win.cc
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line
BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
Delete: sql/handlerton-win.cc
cmakelists.txt:
use INCLUDE to read in the cmake file generated as part of configure
comment out the setting of /wd4996 since we are using the -D flag instead
sql/cmakelists.txt:
include IF() blocks for every storage engine and set two vars that are used with CONFIGURE_FILE later
in the script.
This CONFIGURE_FILE call replaces the need for config-handlerton.js
win/configure.js:
write out proper cmake code instead of just the values.
Diffstat (limited to 'cmakelists.txt')
| -rw-r--r-- | cmakelists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cmakelists.txt b/cmakelists.txt index ab5317ef171..6c6834730b0 100644 --- a/cmakelists.txt +++ b/cmakelists.txt @@ -1,17 +1,18 @@ PROJECT(MySql) EXEC_PROGRAM(cscript.exe win ARGS config-version.js OUT_VARIABLE out) +INCLUDE(win/configure.data) # in some places we use DBUG_OFF SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF") -IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") +#IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") +# SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996") +# SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996") +# SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") +# SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") +#ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8") # replace /MDd with /MTd @@ -29,7 +30,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8") -ADD_DEFINITIONS("-D_WINDOWS -D__WIN__") +ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE") SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra zlib storage/innobase storage/heap storage/myisam storage/myisammrg |