This repository was archived by the owner on Sep 27, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +16
-4
lines changed Expand file tree Collapse file tree 1 file changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -44,12 +44,24 @@ if (NOT __CAPNP_INCLUDED) # guard against multiple includes
44
44
LOG_INSTALL 1
45
45
)
46
46
47
+ # This will set several system default installaion dirs which capnproto is using.
48
+ # It's important especially for LIBDIR which varies from platform to platform.
49
+ include (GNUInstallDirs )
50
+
47
51
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_EXECUTABLE ${capnp_INSTALL} /${CMAKE_INSTALL_BINDIR} /capnp )
53
+ set (CAPNPC_CXX_EXECUTABLE ${capnp_INSTALL} /${CMAKE_INSTALL_BINDIR} /capnpc-c++ )
54
+ set (CAPNP_INCLUDE_DIRS ${capnp_INSTALL} /${CMAKE_INSTALL_INCLUDEDIR} )
55
+ set (CAPNP_INCLUDE_DIRECTORY ${capnp_INSTALL} /${CMAKE_INSTALL_INCLUDEDIR} )
52
56
set (CAPNP_EXTERNAL TRUE )
57
+ set (CAPNP_LIBRARIES
58
+ ${capnp_INSTALL} /${CMAKE_INSTALL_LIBDIR}/libcapnp-rpc.a
59
+ ${capnp_INSTALL} /${CMAKE_INSTALL_LIBDIR}/libcapnp.a
60
+ ${capnp_INSTALL} /${CMAKE_INSTALL_LIBDIR}/libkj-async.a
61
+ ${capnp_INSTALL} /${CMAKE_INSTALL_LIBDIR}/libkj.a
62
+ ${CMAKE_THREAD_LIBS_INIT}
63
+ )
64
+ set (CAPNP_LIBRARY_DIRS ${capnp_INSTALL} /${CMAKE_INSTALL_LIBDIR} )
53
65
54
66
list (APPEND external_project_dependencies capnp )
55
67
You can’t perform that action at this time.
0 commit comments