← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: kent at mysql
  • Date: 2007-08-03 19:51:37 UTC
  • mto: (2476.286.1) (1810.3253.1)
  • mto: This revision was merged to the branch mainline in revision 2481.
  • Revision ID: sp1r-kent@mysql.com/kent-amd64.(none)-20070803195137-14015
CMakeLists.txt, README, configure.js
  Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
22
22
               ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
23
23
 
24
24
# Set standard options
25
 
ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
26
25
ADD_DEFINITIONS(-D CMAKE_BUILD)
27
26
ADD_DEFINITIONS(-D HAVE_YASSL)
28
27
 
29
28
# Set debug options
30
29
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
31
 
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DFORCE_INIT_OF_VARS")
32
 
 
33
 
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")
34
 
 
 
30
 
 
31
# Note that some engines are always compiled in, MyISAM, MyISAMMRG, HEAP
35
32
 
36
33
IF(WITH_ARCHIVE_STORAGE_ENGINE)
37
34
  ADD_DEFINITIONS(-D HAVE_ARCHIVE_DB)
38
35
ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
39
36
 
40
 
IF (WITH_HEAP_STORAGE_ENGINE)
41
 
  ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)
42
 
  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")
43
 
ENDIF (WITH_HEAP_STORAGE_ENGINE)
44
 
 
45
 
IF (WITH_MYISAMMRG_STORAGE_ENGINE)
46
 
  ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)
47
 
  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")
48
 
ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)
49
 
 
50
 
IF(WITH_INNOBASE_STORAGE_ENGINE)
51
 
  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
52
 
  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
53
 
  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
54
 
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
55
 
 
56
 
IF(WITH_FEDERATED_STORAGE_ENGINE)
57
 
  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)
58
 
  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
59
 
  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")
60
 
ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
61
 
 
62
37
IF(WITH_BERKELEY_STORAGE_ENGINE)
63
38
  ADD_DEFINITIONS(-D HAVE_BERKELEY_DB)
64
 
  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)
65
 
  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")
66
39
ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
67
40
 
68
41
IF (WITH_BLACKHOLE_STORAGE_ENGINE)
69
42
  ADD_DEFINITIONS(-D HAVE_BLACKHOLE_DB)
70
43
ENDIF (WITH_BLACKHOLE_STORAGE_ENGINE)
71
44
 
 
45
IF(WITH_EXAMPLE_STORAGE_ENGINE)
 
46
  ADD_DEFINITIONS(-D HAVE_EXAMPLE_DB)
 
47
ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
 
48
 
 
49
IF(WITH_FEDERATED_STORAGE_ENGINE)
 
50
  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)
 
51
ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 
52
 
 
53
IF(WITH_INNOBASE_STORAGE_ENGINE)
 
54
  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
 
55
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 
56
 
72
57
SET(localstatedir "C:\\mysql\\data")
73
58
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh
74
59
               ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY)
102
87
 
103
88
IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
104
89
   CMAKE_GENERATOR MATCHES "Visual Studio 8")
105
 
        # replace /MDd with /MTd
106
 
        STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT 
107
 
               ${CMAKE_CXX_FLAGS_DEBUG_INIT})
108
 
        STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT 
109
 
               ${CMAKE_C_FLAGS_DEBUG_INIT})
110
 
        STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 
111
 
               ${CMAKE_C_FLAGS_RELEASE})
112
 
        STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO 
113
 
               ${CMAKE_C_FLAGS_RELWITHDEBINFO})
114
 
        STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 
115
 
               ${CMAKE_C_FLAGS_DEBUG})
116
 
        STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 
117
 
               ${CMAKE_CXX_FLAGS_RELEASE})
118
 
        STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO 
119
 
               ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
120
 
        STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 
121
 
               ${CMAKE_CXX_FLAGS_DEBUG})
122
 
 
123
 
        # generate map files
124
 
        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
125
 
 
126
 
  # set stack size (see bug#20815)
127
 
  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
128
 
 
129
 
        # remove support for Exception handling
130
 
        STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
131
 
        STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
132
 
        STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT 
133
 
               ${CMAKE_CXX_FLAGS_INIT})
134
 
        STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT 
135
 
               ${CMAKE_CXX_FLAGS_DEBUG_INIT})
 
90
 
 
91
    # replace /MDd with /MTd
 
92
    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
 
93
    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
 
94
    STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
 
95
    STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT       ${CMAKE_C_FLAGS_DEBUG_INIT})
 
96
 
 
97
    STRING(REPLACE "/MD"  "/MT"  CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
 
98
    STRING(REPLACE "/MD"  "/MT"  CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
 
99
    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
 
100
    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT     ${CMAKE_CXX_FLAGS_DEBUG_INIT})
 
101
 
 
102
    # generate map files, set stack size (see bug#20815)
 
103
    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
 
104
    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
 
105
 
 
106
    # remove support for Exception handling
 
107
    STRING(REPLACE "/GX"   "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})
 
108
    STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})
 
109
    STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT       ${CMAKE_CXX_FLAGS_INIT})
 
110
    STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})
 
111
 
136
112
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
137
113
      CMAKE_GENERATOR MATCHES "Visual Studio 8")
138
114
 
196
172
    ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
197
173
ENDIF(EMBED_MANIFESTS)
198
174
 
 
175
# FIXME "debug" only needed if build type is "Debug", but
 
176
# CMAKE_BUILD_TYPE is not set during configure time.
199
177
ADD_SUBDIRECTORY(vio)
200
178
ADD_SUBDIRECTORY(dbug)
201
179
ADD_SUBDIRECTORY(strings)