Remove changes to CMakeLists.txt that cause compile error

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,13 +322,7 @@ 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 (cpprestsdk_FOUND)
 	IF(UNIX)
 #     INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
 #     If needed edit next line to set the path to libcpprest.so
@@ -359,7 +340,7 @@ IF(CONNECT_WITH_REST)
 #   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)
 
 #