diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-04-10 13:15:07 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-04-10 13:15:07 +0200 |
| commit | b4a35ca54b38039063b189a7383ebd6382032e17 (patch) | |
| tree | 9a752eacba8243d6191ed00b60196cb222e19d07 /CMakeLists.txt | |
| parent | b77c664ea82bbd3286a750344e2dac5772d5423b (diff) | |
| parent | d6a3989a2325e8882fc0d725a220155e33af7ff4 (diff) | |
| download | mariadb-git-b4a35ca54b38039063b189a7383ebd6382032e17.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
CMakeLists.txt:
Auto merged
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_bin_dist:
Auto merged
sql/set_var.cc:
Auto merged
support-files/mysql.spec.sh:
merge fix
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48992cf574b..09915c65e6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,14 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO + ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) + STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO + ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + + # generate .map files + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS") + # remove support for Exception handling STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) |