diff options
| author | unknown <iggy@amd64.(none)> | 2007-08-04 02:51:58 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-08-04 02:51:58 -0400 |
| commit | 06cb99ca5aab1a2b1aa65990ef0ddda6e34509ec (patch) | |
| tree | 90d912386bf83c7e96e9ee9af8d89b2c3b163e2c /CMakeLists.txt | |
| parent | e8469adb1782b7c9bc4b79aae000ac7e640828d9 (diff) | |
| download | mariadb-git-06cb99ca5aab1a2b1aa65990ef0ddda6e34509ec.tar.gz | |
Post Merge Fixup.
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49a71867952..76d1bdb5921 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,22 +18,24 @@ PROJECT(MySql) # This reads user configuration, generated by configure.js. INCLUDE(win/configure.data) -# By default, CMake will create Release, Debug, RelWithDebInfo and MinSizeRel -# configurations. The EMBEDDED_ONLY build parameter is necessary because CMake -# doesn't support custom build configurations for VS2005. Since the Debug -# configuration does not work properly with USE_TLS defined -# (see mysys/CMakeLists.txt) the easiest way to debug the Embedded Server is to -# use the RelWithDebInfo configuration without optimizations. -# -# Debug default CXX_FLAGS "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1" -# RelWithDebInfo default CXX_FLAGS "/MD /Zi /O2 /Ob1 /D NDEBUG" -# -IF(NOT EMBEDDED_ONLY) - # Hardcode support for CSV storage engine - SET(WITH_CSV_STORAGE_ENGINE TRUE) -ELSE(NOT EMBEDDED_ONLY) +# Hardcode support for CSV storage engine +SET(WITH_CSV_STORAGE_ENGINE TRUE) + +# CMAKE will not allow custom VS7+ configurations. mysqld and libmysqld +# cannot be built at the same time as they require different configurations +IF(EMBEDDED_ONLY) + ADD_DEFINITIONS(-DEMBEDDED_LIBRARY) + # By default, CMake will create Release, Debug, RelWithDebInfo and MinSizeRel + # configurations. The EMBEDDED_ONLY build parameter is necessary because CMake + # doesn't support custom build configurations for VS2005. Since the Debug + # configuration does not work properly with USE_TLS defined + # (see mysys/CMakeLists.txt) the easiest way to debug the Embedded Server is to + # use the RelWithDebInfo configuration without optimizations. + # + # Debug default CXX_FLAGS "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1" + # RelWithDebInfo default CXX_FLAGS "/MD /Zi /O2 /Ob1 /D NDEBUG" SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /Od /Ob0 /D NDEBUG" CACHE STRING "No Optimization" FORCE) -ENDIF(NOT EMBEDDED_ONLY) +ENDIF(EMBEDDED_ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY) @@ -246,16 +248,13 @@ ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) ADD_SUBDIRECTORY(storage/innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) -# CMAKE will not allow custom VS7+ configurations. mysqld and libmysqld -# cannot be built at the same time as they require different configurations +ADD_SUBDIRECTORY(libmysql) IF(EMBEDDED_ONLY) - ADD_DEFINITIONS(-DEMBEDDED_LIBRARY) ADD_SUBDIRECTORY(libmysqld) ADD_SUBDIRECTORY(libmysqld/examples) ELSE(EMBEDDED_ONLY) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(server-tools/instance-manager) - ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(tests) ENDIF(EMBEDDED_ONLY) |