Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update capnp to 0.5.3.1 #1322

Closed
wants to merge 2 commits into from
Closed

update capnp to 0.5.3.1 #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9fff1
update capnp to 0.5.3.1
breznak May 22, 2017
2b81896
fix spelling
breznak Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions external/CapnProto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ include(../src/NupicLibraryUtils) # for MERGE_STATIC_LIBRARIES
set(CAPNP_STATIC_LIB_TARGET capnp-bundle)

set(capnp_lib_url
"${REPOSITORY_DIR}/external/common/share/capnproto/capnproto-c++-0.5.3.tar.gz")
"${REPOSITORY_DIR}/external/common/share/capnproto/capnproto-c++-0.5.3.1.tar.gz")
set(capnp_win32_tools_url
"${REPOSITORY_DIR}/external/common/share/capnproto/capnproto-c++-win32-0.5.3.zip")
"${REPOSITORY_DIR}/external/common/share/capnproto/capnproto-c++-win32-0.5.3.1.zip")

set(capnp_lib_kj ${LIB_PRE}/${STATIC_PRE}kj${STATIC_SUF})
set(capnp_lib_capnp ${LIB_PRE}/${STATIC_PRE}capnp${STATIC_SUF})
Expand Down Expand Up @@ -119,7 +119,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
${CMAKE_COMMAND} -E make_directory ${BIN_PRE}
INSTALL_COMMAND
${CMAKE_COMMAND} -E copy_directory
"<SOURCE_DIR>/capnproto-tools-win32-0.5.3"
"<SOURCE_DIR>/capnproto-tools-win32-0.5.3.1"
${BIN_PRE}
)
endif()
Expand Down
8 changes: 6 additions & 2 deletions external/common/share/capnproto/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
capnproto-c++-0.5.3.tar.gz: from https://capnproto.org/capnproto-c++-0.5.3.tar.gz
capnproto-c++-win32-0.5.3.zip: from https://capnproto.org/capnproto-c++-win32-0.5.3.zip
capnproto-c++-0.5.3.tar.gz: from https://capnproto.org/capnproto-c++-0.5.3.1.tar.gz
capnproto-c++-win32-0.5.3.zip: from https://capnproto.org/capnproto-c++-win32-0.5.3.1.zip

When pycapnp (in requirements.txt) is updated, please check with which version of capnproto it ships and update the files also here
and in external/CapnProto.cmake !

Binary file added external/common/share/capnproto/capnproto-c++-0.5.3.1.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file removed external/common/share/capnproto/capnproto-c++-0.5.3.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file renamed ...e/capnproto/capnproto-c++-win32-0.5.3.zip → ...capnproto/capnproto-c++-win32-0.5.3.1.zip
View file
Open in desktop
Binary file not shown.