[caffe2] Fix linux build (#5385)

This commit is contained in:
Alexander Karatarakis 2019-02-21 16:34:32 -08:00 committed by Victor Romero
parent 9ee856b9b8
commit 3e6ea891e0
2 changed files with 11 additions and 19 deletions

View File

@ -1,4 +1,4 @@
Source: caffe2
Version: 0.8.1
Version: 0.8.1-1
Build-Depends: lmdb, gflags, glog, eigen3, protobuf
Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.

View File

@ -15,12 +15,8 @@ vcpkg_from_github(
REF eab13a2d5c807bf5d49efd4584787b639a981b79
SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch
${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch
)
if(VCPKG_CRT_LINKAGE STREQUAL static)
@ -29,6 +25,12 @@ else()
set(USE_STATIC_RUNTIME OFF)
endif()
if(CMAKE_HOST_WIN32)
set(EXECUTABLE_SUFFIX ".exe")
else()
set(EXECUTABLE_SUFFIX "")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@ -62,7 +64,7 @@ vcpkg_configure_cmake(
-DUSE_SNPE=OFF
-DUSE_ZMQ=OFF
-DBUILD_TEST=OFF
-DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe
-DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}
)
vcpkg_install_cmake()
@ -86,7 +88,7 @@ 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/*.exe)
file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX})
foreach(binary ${BINARIES})
get_filename_component(binary_name ${binary} NAME)
file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name})
@ -95,22 +97,12 @@ 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)
endif()
# Remove headers and tools from debug build
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
foreach(binary ${BINARIES})
get_filename_component(binary_name ${binary} NAME)
file(REMOVE ${binary})
endforeach()
# Remove bin directory
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
# install license
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 RENAME copyright)