diff options
| author | unknown <iggy@alf.(none)> | 2008-02-27 16:22:10 -0500 |
|---|---|---|
| committer | unknown <iggy@alf.(none)> | 2008-02-27 16:22:10 -0500 |
| commit | 209d9106e39e17a89985709f0205a7e096828fda (patch) | |
| tree | 741bf1b14b1800036877bde5cf3f0a328374c2d9 /CMakeLists.txt | |
| parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
| parent | ed4578c02e446254a5cd1bf7851ff95677068c54 (diff) | |
| download | mariadb-git-209d9106e39e17a89985709f0205a7e096828fda.tar.gz | |
Merge alf.(none):/src/macro_bugs/my50-macro_bugs
into alf.(none):/src/macro_bugs/my51-macro_bugs
include/my_global.h:
Auto merged
CMakeLists.txt:
SCCS merged
include/config-win.h:
SCCS merged
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 341f8d08df2..1fff37c1186 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,14 @@ IF(WIN32) ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") ENDIF(WIN32) +# This definition is necessary to work around a bug with Intellisense described +# here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper +# debugger functionality. +IF(CMAKE_SIZEOF_VOID_P MATCHES 8) + MESSAGE(STATUS "Detected 64-bit platform.") + ADD_DEFINITIONS("-D_WIN64") +ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8) + IF(EMBED_MANIFESTS) # Search for the tools (mt, makecat, signtool) necessary for embedding # manifests and signing executables with the MySQL AB authenticode cert. |