Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 6c65689

Browse files
pranavkapavlo
authored andcommitted
Fix superfluous and incorrect capnp cmake exports
Some of these variables are already exported by cmake files in capnproto in third_party. And correctly. The problem I see in my machine is that capnproto writes the static libs to prefix/lib64/ but hardcoded CAPNP_LIBRARIES says that they are in the prefix/lib/ directory. This makes peloton fail to link with capnp static libs. Let capnp cmake files in third_party handle it correctly.
1 parent aaaa621 commit 6c65689

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

cmake/External/capnproto.cmake

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,6 @@ if (NOT __CAPNP_INCLUDED) # guard against multiple includes
4444
LOG_INSTALL 1
4545
)
4646

47-
set(CAPNP_FOUND TRUE)
48-
set(CAPNP_EXECUTABLE ${capnp_INSTALL}/bin/capnp)
49-
set(CAPNPC_CXX_EXECUTABLE ${capnp_INSTALL}/bin/capnpc-c++)
50-
set(CAPNP_INCLUDE_DIRS ${capnp_INSTALL}/include)
51-
set(CAPNP_INCLUDE_DIRECTORY ${capnp_INSTALL}/include)
52-
set(CAPNP_LIBRARIES
53-
${capnp_INSTALL}/lib/libcapnp-rpc.a
54-
${capnp_INSTALL}/lib/libcapnp.a
55-
${capnp_INSTALL}/lib/libkj-async.a
56-
${capnp_INSTALL}/lib/libkj.a
57-
${CMAKE_THREAD_LIBS_INIT}
58-
)
59-
set(CAPNP_LIBRARY_DIRS ${capnp_INSTALL}/lib)
60-
set(CAPNP_EXTERNAL TRUE)
61-
6247
list(APPEND external_project_dependencies capnp)
6348

6449
endif()

0 commit comments

Comments
 (0)