MCOL-3982 Avoid using autotools for libmarias3 and remove libxml2 from libmarias3 dependencies.

CMakeLists.txt

@@ -311,11 +311,6 @@ SET (ENGINE_COMMON_INCLUDES  ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${L
 
 ADD_SUBDIRECTORY(utils)
 
-add_library(marias3 SHARED IMPORTED)
-set_target_properties(marias3 PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2)
-add_dependencies(marias3 ms3)
-
-
 ADD_SUBDIRECTORY(oam/oamcpp)
 ADD_SUBDIRECTORY(dbcon/execplan)
 ADD_SUBDIRECTORY(dbcon/joblist)

storage-manager/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(storagemanager)
 
-include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE})
+include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE} ${S3API_DIR})
 
 set(storagemanager_SRCS 
     src/AppendTask.cpp

utils/libmarias3/CMakeLists.txt

@@ -16,22 +16,24 @@ if(GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git)
     endif()
 endif()
 
-include(ExternalProject)
+SET(S3_SOURCES ${S3API_DIR}/src/debug.c
-ExternalProject_Add(ms3
+    ${S3API_DIR}/src/error.c
-    SOURCE_DIR ${S3API_DIR}
+    ${S3API_DIR}/src/marias3.c
-    CONFIGURE_COMMAND autoreconf -fi ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared --disable-static --prefix=${CMAKE_BINARY_DIR} ${S3_CONFIGURE_OPT}
+    ${S3API_DIR}/src/request.c
-    BUILD_COMMAND make
+    ${S3API_DIR}/src/response.c
-    BUILD_IN_SOURCE 0
+    ${S3API_DIR}/src/sha256.c
-    EXCLUDE_FROM_ALL TRUE
+    ${S3API_DIR}/src/sha256-internal.c
-    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2
+    ${S3API_DIR}/src/xml.c)
-)
 
-set(S3API_DEPS marias3 curl xml2 CACHE INTERNAL "S3API_DEPS")
+ADD_LIBRARY(marias3 SHARED ${S3_SOURCES})
 
-install(PROGRAMS
+FIND_PACKAGE(CURL REQUIRED)
-    ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2
+TARGET_LINK_LIBRARIES(marias3 curl)
-    ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3
+INCLUDE_DIRECTORIES(${S3API_DIR})
-    ${CMAKE_BINARY_DIR}/lib/libmarias3.so
+
+set(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
+
+install(TARGETS marias3
     DESTINATION ${ENGINE_LIBDIR}
     COMPONENT columnstore-platform
 )