Update protobuf3 and use CMake

Author: dstoup

CMake/External_Protobuf.cmake

@@ -1,43 +1,71 @@
-if (WIN32)
-  # Build option for windows not yet generated
-  message( FATAL_ERROR "Protobuf on windows not yet supported" )
-endif()
 
-# Check that python and protobuf versions are compatible
-if(fletch_BUILD_WITH_PYTHON AND fletch_ENABLE_Protobuf)
-  # Note the python protobuf wrapper is not installed here.
-  # Instead it must be installed via `pip install protobuf`
-  if (${Protobuf_version} LESS 3.0 AND fletch_PYTHON_MAJOR_VERSION MATCHES "^3.*")
-    message(ERROR " Must use Protobuf >= 3.x with Python 3.x")
+if (Protobuf_SELECT_VERSION STREQUAL "3.9.0")
+  # Check that python and protobuf versions are compatible
+  if(fletch_BUILD_WITH_PYTHON)
+    # Note the python protobuf wrapper is not installed here.
+    # Instead it must be installed via `pip install protobuf`
+    if (fletch_PYTHON_MAJOR_VERSION MATCHES "^2.*")
+      message(ERROR " Must use Python >= 3.x with Protobuf 3.x")
+    endif()
   endif()
-endif()
 
 
+  ExternalProject_Add(Protobuf
+#    PREFIX protobuf
+    URL ${Protobuf_url}
+    URL_MD5 ${Protobuf_md5}
+    SOURCE_SUBDIR ./cmake
+    ${COMMON_EP_ARGS}
+    ${COMMON_CMAKE_EP_ARGS}
+#    UPDATE_COMMAND
+#        COMMAND ${CMAKE_COMMAND} -DPULSE_IL2CPP_PATCH=${PULSE_IL2CPP_PATCH} -Dprotobuf_source=${protobuf_SRC} -Dprotobuf_patch=${protobuf_Patch} -P ${protobuf_Patch}/Patch.cmake
+    CMAKE_ARGS
+       ${COMMON_CMAKE_ARGS}
+       -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+       -Dprotobuf_BUILD_TESTS:BOOL=OFF
+       -Dprotobuf_BUILD_EXAMPLES:BOOL=OFF
+       -Dprotobuf_BUILD_SHARED_LIBS:BOOL=OFF
+       -Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF#Don't change MSVC runtime settings (/MD or /MT)
+       -Dprotobuf_WITH_ZLIB:BOOL=OFF
+    )
+elseif (NOT WIN32)
 
-set (Protobuf_PATCH_DIR ${fletch_SOURCE_DIR}/Patches/Protobuf/${Protobuf_SELECT_VERSION})
-if (EXISTS ${Protobuf_PATCH_DIR})
-  set(Protobuf_PATCH_COMMAND ${CMAKE_COMMAND}
-    -DProtobuf_PATCH_DIR=${Protobuf_PATCH_DIR}
-    -DProtobuf_SOURCE_DIR=${fletch_BUILD_PREFIX}/src/Protobuf
-    -P ${Protobuf_PATCH_DIR}/Patch.cmake)
-else()
-  set(Protobuf_PATCH_COMMAND "")
-endif()
+  # Check that python and protobuf versions are compatible
+  if(fletch_BUILD_WITH_PYTHON AND fletch_ENABLE_Protobuf)
+    # Note the python protobuf wrapper is not installed here.
+    # Instead it must be installed via `pip install protobuf`
+    if (${Protobuf_version} LESS 3.0 AND fletch_PYTHON_MAJOR_VERSION MATCHES "^3.*")
+      message(ERROR " You must use Protobuf >= 3.x with Python 3.x")
+    endif()
+  endif()
 
+  set (Protobuf_PATCH_DIR ${fletch_SOURCE_DIR}/Patches/Protobuf/${Protobuf_SELECT_VERSION})
+  if (EXISTS ${Protobuf_PATCH_DIR})
+    set(Protobuf_PATCH_COMMAND ${CMAKE_COMMAND}
+      -DProtobuf_PATCH_DIR=${Protobuf_PATCH_DIR}
+      -DProtobuf_SOURCE_DIR=${fletch_BUILD_PREFIX}/src/Protobuf
+      -P ${Protobuf_PATCH_DIR}/Patch.cmake)
+  else()
+    set(Protobuf_PATCH_COMMAND "")
+  endif()
 
-Fletch_Require_Make()
-ExternalProject_Add(Protobuf
-  URL ${Protobuf_url}
-  URL_MD5 ${Protobuf_md5}
-  ${COMMON_EP_ARGS}
-  PATCH_COMMAND ${CMAKE_COMMAND}
+  Fletch_Require_Make()
+  ExternalProject_Add(Protobuf
+    URL ${Protobuf_url}
+    URL_MD5 ${Protobuf_md5}
+    ${COMMON_EP_ARGS}
+    PATCH_COMMAND ${CMAKE_COMMAND}
     ${Protobuf_PATCH_COMMAND}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ./configure
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ./configure
     --prefix=${fletch_BUILD_INSTALL_PREFIX}
-  BUILD_COMMAND ${MAKE_EXECUTABLE}
-  INSTALL_COMMAND ${MAKE_EXECUTABLE} install
-)
+    BUILD_COMMAND ${MAKE_EXECUTABLE}
+    INSTALL_COMMAND ${MAKE_EXECUTABLE} install
+    )
+else()
+  # Build option for windows not yet generated
+  message( FATAL_ERROR "Protobuf 2 not yet supported on windows" )
+endif()
 
 fletch_external_project_force_install(PACKAGE Protobuf)
 

CMake/fletch-tarballs.cmake

@@ -492,18 +492,18 @@ endif()
 # Protobuf
 if(NOT WIN32)
   if (fletch_ENABLE_Protobuf OR fletch_ENABLE_ALL_PACKAGES OR AUTO_ENABLE_CAFFE_DEPENDENCY)
-    set(Protobuf_SELECT_VERSION "2.5.0" CACHE STRING "Select the  version of ProtoBuf to build.")
-    set_property(CACHE Protobuf_SELECT_VERSION PROPERTY STRINGS "2.5.0" "3.4.1")
+    set(Protobuf_SELECT_VERSION "3.9.0" CACHE STRING "Select the  version of ProtoBuf to build.")
+    set_property(CACHE Protobuf_SELECT_VERSION PROPERTY STRINGS "2.5.0" "3.9.0")
   endif()
 
   set(Protobuf_version ${Protobuf_SELECT_VERSION})
 
   if (Protobuf_version VERSION_EQUAL 2.5.0)
     set(Protobuf_url "https://github.com/google/protobuf/releases/download/v${Protobuf_version}/protobuf-${Protobuf_version}.tar.bz2" )
     set(Protobuf_md5 "a72001a9067a4c2c4e0e836d0f92ece4" )
-  elseif (Protobuf_version VERSION_EQUAL 3.4.1)
-    set(Protobuf_url "https://github.com/google/protobuf/releases/download/v${Protobuf_version}/protobuf-cpp-${Protobuf_version}.tar.gz" )
-    set(Protobuf_md5 "74446d310ce79cf20bab3ffd0e8f8f8f" )
+  elseif (Protobuf_version VERSION_EQUAL 3.9.0)
+    set(Protobuf_url "https://github.com/protocolbuffers/protobuf/releases/download/v${Protobuf_version}/protobuf-all-${Protobuf_version}.zip")
+    set(Protobuf_md5 "4f042c8b46823a69db3dcbc7381b73f4" )
   elseif(Protobuf_version)
     message(ERROR "Protobuf Version ${Protobuf_version} Not Supported")
   endif()