[glog] update to v0.5

ports/caffe2/no-inout-macros.patch

@@ -0,0 +1,18 @@
+diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h
+index 2df4435..408bb4a 100644
+--- a/caffe2/core/logging_is_google_glog.h
++++ b/caffe2/core/logging_is_google_glog.h
+@@ -30,5 +30,13 @@ INSTANTIATE_FOR_CONTAINER(std::set)
+
+ #include <glog/logging.h>
+
++#ifdef IN
++#undef IN
++#endif
++
++#ifdef OUT
++#undef OUT
++#endif
++
+
+ #endif  // CAFFE2_CORE_LOGGING_IS_GOOGLE_GLOG_H_

ports/caffe2/portfile.cmake

@@ -1,9 +1,5 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-    message(FATAL_ERROR "Caffe2 cannot be built for the x86 architecture")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO caffe2/caffe2
@@ -14,6 +10,7 @@ vcpkg_from_github(
         msvc-fixes.patch
         fix-space.patch
         fix-protobuf-deprecated.patch
+        no-inout-macros.patch
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)
@@ -28,9 +25,8 @@ else()
     set(EXECUTABLE_SUFFIX "")
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
     # Set to ON to use python
     -DBUILD_PYTHON=OFF
@@ -63,44 +59,43 @@ vcpkg_configure_cmake(
     -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Remove folders from install
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe2)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe2)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe2")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe2")
 
 # Remove empty directories from include (should probably fix or
 # patch caffe2 install script)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/test)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/python)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/binaries)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/test")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/python")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/binaries")
 
 # Move bin to tools
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX})
-foreach(binary ${BINARIES})
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
+file(GLOB BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}")
+foreach(binary IN LISTS BINARIES)
     get_filename_component(binary_name ${binary} NAME)
-    file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name})
+    file(RENAME ${binary} "${CURRENT_PACKAGES_DIR}/tools/${binary_name}")
 endforeach()
 
 # Remove bin directory
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 # Remove headers and tools from debug build
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # install license
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()

ports/caffe2/vcpkg.json

@@ -1,15 +1,20 @@
 {
   "name": "caffe2",
-  "version-string": "0.8.1",
-  "port-version": 5,
+  "version": "0.8.1",
+  "port-version": 6,
   "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.",
   "homepage": "https://github.com/caffe2/caffe2",
+  "license": "Apache-2.0",
   "supports": "!x86",
   "dependencies": [
     "eigen3",
     "gflags",
     "glog",
     "lmdb",
-    "protobuf"
+    "protobuf",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }

ports/glog/fix_glog_CMAKE_MODULE_PATH.patch

@@ -0,0 +1,77 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28e2688..cf87798 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -843,36 +843,6 @@ write_basic_package_version_file (
+ export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
+ export (PACKAGE glog)
+
+-get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
+-
+-# Directory containing the find modules relative to the config install
+-# directory.
+-file (RELATIVE_PATH glog_REL_CMake_MODULES
+-  ${_PREFIX}/${_glog_CMake_INSTALLDIR}
+-  ${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake)
+-
+-get_filename_component (glog_REL_CMake_DATADIR ${glog_REL_CMake_MODULES}
+-  DIRECTORY)
+-
+-set (glog_FULL_CMake_DATADIR
+-  ${CMAKE_CURRENT_BINARY_DIR}/${_glog_CMake_DATADIR})
+-
+-configure_file (glog-modules.cmake.in
+-  ${CMAKE_CURRENT_BINARY_DIR}/glog-modules.cmake @ONLY)
+-
+-install (CODE
+-"
+-set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\")
+-configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\"
+-  \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY)
+-file (INSTALL
+-  \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\"
+-  DESTINATION
+-  \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\")
+-"
+-  COMPONENT Development
+-)
+-
+ install (FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
+   ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
+diff --git a/glog-config.cmake.in b/glog-config.cmake.in
+index 5c5c9c0..31fac52 100644
+--- a/glog-config.cmake.in
++++ b/glog-config.cmake.in
+@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
+ @PACKAGE_INIT@
+
+ include (CMakeFindDependencyMacro)
+-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake)
+
+ @gflags_DEPENDENCY@
+ @Unwind_DEPENDENCY@
+diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in
+deleted file mode 100644
+index 71c5160..0000000
+--- a/glog-modules.cmake.in
++++ /dev/null
+@@ -1,18 +0,0 @@
+-cmake_policy (PUSH)
+-cmake_policy (SET CMP0057 NEW)
+-
+-if (CMAKE_VERSION VERSION_LESS 3.3)
+-  message (FATAL_ERROR "glog-modules.cmake requires the consumer "
+-    "to use CMake 3.3 (or newer)")
+-endif (CMAKE_VERSION VERSION_LESS 3.3)
+-
+-set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@")
+-list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH})
+-
+-if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH)
+-  message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to "
+-    "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at "
+-    "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.")
+-endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH)
+-
+-cmake_policy (POP)