Commit 59e95fe6 authored by Alexander Barkov's avatar Alexander Barkov

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
parent df153bb5
...@@ -30,7 +30,7 @@ filamzip.cpp tabtbl.cpp myutil.cpp) ...@@ -30,7 +30,7 @@ filamzip.cpp tabtbl.cpp myutil.cpp)
# #
# Definitions that are shared for all OSes # 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 ) add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT )
...@@ -68,7 +68,7 @@ IF(UNIX) ...@@ -68,7 +68,7 @@ IF(UNIX)
get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c) SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c)
SET(IPHLPAPI_LIBRARY "") SET(IPHLPAPI_LIBRARY "")
ELSE(!UNIX) ELSE(NOT UNIX)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabwmi.cpp tabmac.cpp macutil.cpp) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabwmi.cpp tabmac.cpp macutil.cpp)
# Add exception handling to the CONNECT project) # Add exception handling to the CONNECT project)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
...@@ -160,12 +160,12 @@ IF(CONNECT_WITH_MYSQL) ...@@ -160,12 +160,12 @@ IF(CONNECT_WITH_MYSQL)
# For dynamic linking # For dynamic linking
SET(MYSQL_LIBRARY libmysql) SET(MYSQL_LIBRARY libmysql)
add_definitions(-DMYSQL_SUPPORT) add_definitions(-DMYSQL_SUPPORT)
IF(!UNIX) IF(NOT UNIX)
# #
# TODO: remove this # TODO: remove this
# change to use "#include "../../include/mysql.h" in the sources. # change to use "#include "../../include/mysql.h" in the sources.
INCLUDE_DIRECTORIES("../../include/mysql") INCLUDE_DIRECTORIES("../../include/mysql")
ENDIF(!UNIX) ENDIF(NOT UNIX)
ENDIF(CONNECT_WITH_MYSQL) ENDIF(CONNECT_WITH_MYSQL)
...@@ -222,7 +222,7 @@ IF(CONNECT_WITH_ODBC) ...@@ -222,7 +222,7 @@ IF(CONNECT_WITH_ODBC)
ELSE() ELSE()
SET(ODBC_LIBRARY "") SET(ODBC_LIBRARY "")
ENDIF() ENDIF()
ELSE(!UNIX) ELSE(NOT UNIX)
add_definitions(-DODBC_SUPPORT) add_definitions(-DODBC_SUPPORT)
SET(ODBC_LIBRARY "odbc32.lib odbccp32.lib") SET(ODBC_LIBRARY "odbc32.lib odbccp32.lib")
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment