summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-02-19 13:53:24 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-02-19 13:53:24 +0400
commit59e95fe6bb32a30f664109e7e93882f8c73d4e86 (patch)
tree801dcdbbb842e7c9ad140cd2b83bbea217393b11 /storage
parentdf153bb56bf375b98c332e3906b5d887b9de179c (diff)
downloadmariadb-git-59e95fe6bb32a30f664109e7e93882f8c73d4e86.tar.gz
Cmake clean-ups:
- Removing -DMYSQL_DYNAMIC_PLUGIN. Its automatically added by MYSQL_ADD_PLUGIN - Replacing "IF(!XXX)" to "IF(NOT XXX)". The former is a wrong cmake syntax. modified: storage/connect/CMakeLists.txt
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 5595c6fd3bb..4011eabae0e 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -30,7 +30,7 @@ filamzip.cpp tabtbl.cpp myutil.cpp)
#
# Definitions that are shared for all OSes
#
-add_definitions( -DMYSQL_DYNAMIC_PLUGIN -DMARIADB -DFORCE_INIT_OF_VARS )
+add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS )
add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT )
@@ -68,7 +68,7 @@ IF(UNIX)
get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c)
SET(IPHLPAPI_LIBRARY "")
-ELSE(!UNIX)
+ELSE(NOT UNIX)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabwmi.cpp tabmac.cpp macutil.cpp)
# Add exception handling to the CONNECT project)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
@@ -160,12 +160,12 @@ IF(CONNECT_WITH_MYSQL)
# For dynamic linking
SET(MYSQL_LIBRARY libmysql)
add_definitions(-DMYSQL_SUPPORT)
- IF(!UNIX)
+ IF(NOT UNIX)
#
# TODO: remove this
# change to use "#include "../../include/mysql.h" in the sources.
INCLUDE_DIRECTORIES("../../include/mysql")
- ENDIF(!UNIX)
+ ENDIF(NOT UNIX)
ENDIF(CONNECT_WITH_MYSQL)
@@ -222,7 +222,7 @@ IF(CONNECT_WITH_ODBC)
ELSE()
SET(ODBC_LIBRARY "")
ENDIF()
- ELSE(!UNIX)
+ ELSE(NOT UNIX)
add_definitions(-DODBC_SUPPORT)
SET(ODBC_LIBRARY "odbc32.lib odbccp32.lib")
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp)