WL15064 Possibility to use external 3rd-party dependencies

By default, it will still use the bundled sources to build

Change-Id: If624fd626ec2a2f1157311d51519e3f58f99e5ee

Author: silvakid

cdk/cmake/DepFindCompression.cmake

@@ -26,35 +26,50 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-##############################################################################
+# #############################################################################
 #
 # Targets:
 #
 # (re)build-{zlib,lz4,zstd}
 #
 # Imported/alias targets:
 #
-# ext::zlib
+# ext::z
 # ext::lz4
 # ext::zstd
 #
-# TODO:
-#  - allow use of external, dynamic libraries instead of static linking
-#
 
-if(TARGET ext::zlib)
+if(TARGET ext::z)
   return()
 endif()
 
 message(STATUS "Setting up compression libraries.")
 
-# Use external builds from the bundled sources
+#######
+# ZLIB
+#
+add_ext(zlib zlib.h z ext_zlib)
+if(NOT ZLIB_FOUND)
+  message(FATAL_ERROR "Can't build without zlib support")
+endif()
+
 
-add_ext(zlib)
-add_ext_targets(zlib zlib ext_zlib)
+#######
+# LZ4
+#
+add_ext(lz4 lz4frame.h lz4 ext_lz4)
 
-add_ext(lz4)
-add_ext_targets(lz4 lz4 ext_lz4)
+if(NOT LZ4_FOUND)
+  message(FATAL_ERROR "Can't build without lz4 support")
+endif()
+
+
+#######
+# ZSTD
+#
+add_ext(zstd zstd.h zstd ext_zstd)
+
+if(NOT LZ4_FOUND)
+  message(FATAL_ERROR "Can't build without zstd support")
+endif()
 
-add_ext(zstd)
-add_ext_targets(zstd zstd ext_zstd)

cdk/cmake/DepFindProtobuf.cmake

@@ -26,7 +26,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-##############################################################################
+# #############################################################################
 #
 # Targets:
 #
@@ -42,36 +42,32 @@
 #
 # mysqlx_protobuf_generate_cpp()
 #
-# TODO:
-# - Allow using external install of protobuf instead of building it from
-#   bundled sources
 #
 
-
 if(TARGET ext::protobuf)
   return()
 endif()
 
 message(STATUS "Setting up Protobuf.")
 
 # Setup extrnal project that builds protobuf from  bundled sources
+add_ext(protobuf google/protobuf/api.pb.h)
 
-add_ext(protobuf)
+if(NOT PROTOBUF_FOUND)
+  message(FATAL_ERROR "Can't build without protobuf support")
+endif()
 
-# import targets from the external project 
+# import targets from the external project
 # Note: The pb_ targets are created by protobuf/exports.cmake
-
 add_ext_targets(protobuf
-  pb-lite pb_libprotobuf-lite
-  pb-full pb_libprotobuf
-  protoc  pb_protoc
+  LIBRARY protobuf-lite pb_libprotobuf-lite
+  LIBRARY protobuf pb_libprotobuf
+  EXECUTABLE protoc pb_protoc
 )
 
 
 # Standard PROTOBUF_GENERATE_CPP modified to our usage
-
 function(mysqlx_protobuf_generate_cpp SRCS HDRS)
-
   IF(NOT ARGN)
     MESSAGE(SEND_ERROR
       "Error: MYSQLX_PROTOBUF_GENERATE_CPP() called without any proto files")
@@ -82,7 +78,6 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
   SET(hdrs)
 
   FOREACH(FIL ${ARGN})
-
     GET_FILENAME_COMPONENT(ABS_FIL ${FIL} ABSOLUTE)
     GET_FILENAME_COMPONENT(FIL_WE ${FIL} NAME_WE)
     GET_FILENAME_COMPONENT(ABS_PATH ${ABS_FIL} PATH)
@@ -92,18 +87,18 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
 
     ADD_CUSTOM_COMMAND(
       OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.cc"
-             "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h"
+      "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h"
       COMMAND ${CMAKE_COMMAND}
-            -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf"
+      -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf"
       COMMAND ext::protoc
       ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf"
-           -I ${ABS_PATH} ${ABS_FIL}
-           #--proto_path=${PROTOBUF_INCLUDE_DIR}
+      -I ${ABS_PATH} ${ABS_FIL}
+
+      # --proto_path=${PROTOBUF_INCLUDE_DIR}
       DEPENDS ${ABS_FIL}
       COMMENT "Running C++ protocol buffer compiler on ${FIL}"
       VERBATIM
     )
-
   ENDFOREACH()
 
   SET_SOURCE_FILES_PROPERTIES(
@@ -113,7 +108,6 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
   #
   # Disable compile warnings in code generated by Protobuf
   #
-
   IF(UNIX)
     set_source_files_properties(${srcs}
       APPEND_STRING PROPERTY COMPILE_FLAGS "-w"
@@ -125,8 +119,6 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
     )
   ENDIF()
 
-
   SET(${SRCS} ${srcs} PARENT_SCOPE)
   SET(${HDRS} ${hdrs} PARENT_SCOPE)
-
 endfunction(mysqlx_protobuf_generate_cpp)