diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-01-10 01:05:38 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-01-10 01:05:38 +0100 |
| commit | 251a55dcb4d31821c141583255dc5239b9d06065 (patch) | |
| tree | efee498b287f0b9a93af7f6c7d6143b55d503d6d | |
| parent | 02bb11709d7baddb74bfe9285cd542b818da1862 (diff) | |
| download | mariadb-git-251a55dcb4d31821c141583255dc5239b9d06065.tar.gz | |
Remove changes to CMakeLists.txt that cause compile error
| -rw-r--r-- | storage/connect/CMakeLists.txt | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index c83cc584e9d..7eedba08bee 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -80,19 +80,6 @@ ELSE(NOT UNIX) ENDIF() ENDIF(UNIX) -# -# BSON: this the new version of JSON that is temporarily included here for testing -# When fully tested, it will replace the old support (and be renamed to JSON) -# - -OPTION(CONNECT_WITH_BSON "Compile CONNECT storage engine with BSON support" ON) - -IF(CONNECT_WITH_BSON) - SET(CONNECT_SOURCES ${CONNECT_SOURCES} - bson.cpp tabbson.cpp bsonudf.cpp bson.h tabbson.h bsonudf.h) - add_definitions(-DBSON_SUPPORT) -ENDIF(CONNECT_WITH_BSON) - # # VCT: the VEC format might be not supported in future versions @@ -335,31 +322,25 @@ IF(CONNECT_WITH_REST) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp tabrest.h) add_definitions(-DREST_SUPPORT) FIND_PACKAGE(cpprestsdk QUIET) - IF (UNIX) - execute_process(COMMAND lsb_release -is - OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT - OUTPUT_STRIP_TRAILING_WHITESPACE) - MESSAGE (STATUS ${LSB_RELEASE_ID_SHORT}) - ENDIF(UNIX) - IF (cpprestsdk_FOUND OR ("${LSB_RELEASE_ID_SHORT}" STREQUAL "Ubuntu")) - IF(UNIX) + IF (cpprestsdk_FOUND) + IF(UNIX) # INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR}) # If needed edit next line to set the path to libcpprest.so SET(REST_LIBRARY -lcpprest) MESSAGE (STATUS ${REST_LIBRARY}) - ELSE(NOT UNIX) + ELSE(NOT UNIX) # Next line sets debug compile mode matching cpprest_2_10d.dll # when it was binary installed (can be change later in Visual Studio) # Comment it out if not needed depending on your cpprestsdk installation. - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") - ENDIF(UNIX) + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") + ENDIF(UNIX) # IF(REST_LIBRARY) why this? how about Windows SET(CONNECT_SOURCES ${CONNECT_SOURCES} restget.cpp) add_definitions(-DREST_SOURCE) # ENDIF() # ELSE(NOT cpprestsdk_FOUND) # MESSAGE(STATUS "=====> cpprestsdk package not found") - ENDIF (cpprestsdk_FOUND OR ("${LSB_RELEASE_ID_SHORT}" STREQUAL "Ubuntu")) + ENDIF (cpprestsdk_FOUND) ENDIF(CONNECT_WITH_REST) # |