mirror of
https://github.com/MariaDB/server.git
synced 2025-02-16 18:35:34 +01:00
Fix connect RESTSDK support.
Remove debug output, remove overriding of the Windows C runtime flags(linker warning) do not add code that depends on restsdk if library is not going to be linked. freaking Connect
This commit is contained in:
parent
803bb5cdf8
commit
7e7b6ec4d6
1 changed files with 7 additions and 11 deletions
|
@ -73,10 +73,6 @@ ELSE(NOT UNIX)
|
||||||
tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
|
tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
|
||||||
# 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")
|
||||||
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
|
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
|
|
||||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
|
|
||||||
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
|
|
||||||
SET(IPHLPAPI_LIBRARY iphlpapi.lib)
|
SET(IPHLPAPI_LIBRARY iphlpapi.lib)
|
||||||
IF(MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES Clang))
|
IF(MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES Clang))
|
||||||
# Connect does not work with clang-cl
|
# Connect does not work with clang-cl
|
||||||
|
@ -322,20 +318,20 @@ ENDIF(CONNECT_WITH_MONGO)
|
||||||
OPTION(CONNECT_WITH_REST "Compile CONNECT storage engine with REST support" ON)
|
OPTION(CONNECT_WITH_REST "Compile CONNECT storage engine with REST support" ON)
|
||||||
|
|
||||||
IF(CONNECT_WITH_REST)
|
IF(CONNECT_WITH_REST)
|
||||||
MESSAGE(STATUS "=====> REST support is ON")
|
FIND_PACKAGE(cpprestsdk QUIET)
|
||||||
FIND_PACKAGE(cpprestsdk)
|
|
||||||
IF (cpprestsdk_FOUND)
|
IF (cpprestsdk_FOUND)
|
||||||
MESSAGE(STATUS "=====> cpprestsdk found")
|
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
# INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
|
# INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
|
||||||
# If needed edit next line to set the path to libcpprest.so
|
# If needed edit next line to set the path to libcpprest.so
|
||||||
SET(REST_LIBRARY -lcpprest)
|
SET(REST_LIBRARY -lcpprest)
|
||||||
MESSAGE (STATUS ${REST_LIBRARY})
|
# MESSAGE (STATUS ${REST_LIBRARY})
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp restget.cpp tabrest.h)
|
IF(REST_LIBRARY)
|
||||||
add_definitions(-DREST_SUPPORT)
|
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp restget.cpp tabrest.h)
|
||||||
|
add_definitions(-DREST_SUPPORT)
|
||||||
|
ENDIF()
|
||||||
ELSE(NOT cpprestsdk_FOUND)
|
ELSE(NOT cpprestsdk_FOUND)
|
||||||
MESSAGE(STATUS "=====> cpprestsdk package not found")
|
# MESSAGE(STATUS "=====> cpprestsdk package not found")
|
||||||
ENDIF (cpprestsdk_FOUND)
|
ENDIF (cpprestsdk_FOUND)
|
||||||
ENDIF(CONNECT_WITH_REST)
|
ENDIF(CONNECT_WITH_REST)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue