mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post Merge Fixup.

Browse source
This commit is contained in:
unknown 2007-08-04 02:51:58 -04:00
parent e8469adb17
commit 06cb99ca5a
2 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
CMakeLists.txt
View file

@ -18,22 +18,24 @@ PROJECT(MySql)
# This reads user configuration, generated by configure.js. # This reads user configuration, generated by configure.js.
INCLUDE(win/configure.data) INCLUDE(win/configure.data)
# By default, CMake will create Release, Debug, RelWithDebInfo and MinSizeRel # Hardcode support for CSV storage engine
# configurations. The EMBEDDED_ONLY build parameter is necessary because CMake SET(WITH_CSV_STORAGE_ENGINE TRUE)
# doesn't support custom build configurations for VS2005. Since the Debug
# configuration does not work properly with USE_TLS defined # CMAKE will not allow custom VS7+ configurations. mysqld and libmysqld
# (see mysys/CMakeLists.txt) the easiest way to debug the Embedded Server is to # cannot be built at the same time as they require different configurations
# use the RelWithDebInfo configuration without optimizations. IF(EMBEDDED_ONLY)
# ADD_DEFINITIONS(-DEMBEDDED_LIBRARY)
# Debug default CXX_FLAGS "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1" # By default, CMake will create Release, Debug, RelWithDebInfo and MinSizeRel
# RelWithDebInfo default CXX_FLAGS "/MD /Zi /O2 /Ob1 /D NDEBUG" # configurations. The EMBEDDED_ONLY build parameter is necessary because CMake
# # doesn't support custom build configurations for VS2005. Since the Debug
IF(NOT EMBEDDED_ONLY) # configuration does not work properly with USE_TLS defined
# Hardcode support for CSV storage engine # (see mysys/CMakeLists.txt) the easiest way to debug the Embedded Server is to
SET(WITH_CSV_STORAGE_ENGINE TRUE) # use the RelWithDebInfo configuration without optimizations.
ELSE(NOT EMBEDDED_ONLY) #
# 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) 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 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY) ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
@ -246,16 +248,13 @@ ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
IF(WITH_INNOBASE_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(storage/innobase) ADD_SUBDIRECTORY(storage/innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE) ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
# CMAKE will not allow custom VS7+ configurations. mysqld and libmysqld ADD_SUBDIRECTORY(libmysql)
# cannot be built at the same time as they require different configurations
IF(EMBEDDED_ONLY) IF(EMBEDDED_ONLY)
ADD_DEFINITIONS(-DEMBEDDED_LIBRARY)
ADD_SUBDIRECTORY(libmysqld) ADD_SUBDIRECTORY(libmysqld)
ADD_SUBDIRECTORY(libmysqld/examples) ADD_SUBDIRECTORY(libmysqld/examples)
ELSE(EMBEDDED_ONLY) ELSE(EMBEDDED_ONLY)
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(server-tools/instance-manager) ADD_SUBDIRECTORY(server-tools/instance-manager)
ADD_SUBDIRECTORY(libmysql)
ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tests)
ENDIF(EMBEDDED_ONLY) ENDIF(EMBEDDED_ONLY)

28
libmysql/CMakeLists.txt
View file

@ -110,24 +110,24 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
# beond the documented API, and try access the Thread Local Storage. # beond the documented API, and try access the Thread Local Storage.
# The "_notls" means no Tls*() functions used, i.e. "static" TLS. # The "_notls" means no Tls*() functions used, i.e. "static" TLS.
ADD_LIBRARY(libmysql SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
ADD_LIBRARY(mysqlclient STATIC ${CLIENT_SOURCES}) ADD_LIBRARY(mysqlclient STATIC ${CLIENT_SOURCES})
ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES})
SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")
ADD_DEPENDENCIES(libmysql GenError)
TARGET_LINK_LIBRARIES(libmysql wsock32)
ADD_DEPENDENCIES(mysqlclient GenError) ADD_DEPENDENCIES(mysqlclient GenError)
TARGET_LINK_LIBRARIES(mysqlclient) TARGET_LINK_LIBRARIES(mysqlclient)
ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES})
ADD_DEPENDENCIES(mysqlclient_notls GenError) ADD_DEPENDENCIES(mysqlclient_notls GenError)
TARGET_LINK_LIBRARIES(mysqlclient_notls) TARGET_LINK_LIBRARIES(mysqlclient_notls)
ADD_EXECUTABLE(myTest mytest.c) IF(NOT EMBEDDED_ONLY)
TARGET_LINK_LIBRARIES(myTest libmysql) ADD_LIBRARY(libmysql SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")
IF(EMBED_MANIFESTS) ADD_DEPENDENCIES(libmysql GenError)
MYSQL_EMBED_MANIFEST("myTest" "asInvoker") TARGET_LINK_LIBRARIES(libmysql wsock32)
ENDIF(EMBED_MANIFESTS)
ADD_EXECUTABLE(myTest mytest.c)
TARGET_LINK_LIBRARIES(myTest libmysql)
IF(EMBED_MANIFESTS)
MYSQL_EMBED_MANIFEST("myTest" "asInvoker")
ENDIF(EMBED_MANIFESTS)
ENDIF(NOT EMBEDDED_ONLY)