Skip to content

Commit 72326b5

Browse files
committed
cmake: Simplify capnp include handling
Stop using lower level target_include_directories to add CAPNP_INCLUDE_DIRECTORY includes. This is no longer needed now that newer capnproto releases provide targets that set their own includes. This change is based on some similar cleanups originally implemented by Cory Fields <[email protected]> in #141
1 parent 65c7048 commit 72326b5

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ capnp_generate_cpp(MP_PROXY_SRCS MP_PROXY_HDRS include/mp/proxy.capnp)
5353
add_library(mputil OBJECT src/mp/util.cpp)
5454
target_include_directories(mputil PRIVATE
5555
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
56-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
57-
${CAPNP_INCLUDE_DIRECTORY})
56+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
57+
target_link_libraries(mputil PUBLIC CapnProto::kj)
5858

5959
# libmultiprocess.a runtime library
6060
set(MP_PUBLIC_HEADERS
@@ -93,8 +93,7 @@ add_library(Libmultiprocess::multiprocess ALIAS multiprocess)
9393
target_include_directories(multiprocess PUBLIC
9494
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
9595
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
96-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
97-
${CAPNP_INCLUDE_DIRECTORY})
96+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
9897
target_link_libraries(multiprocess PUBLIC CapnProto::capnp)
9998
target_link_libraries(multiprocess PUBLIC CapnProto::capnp-rpc)
10099
target_link_libraries(multiprocess PUBLIC CapnProto::kj)

0 commit comments

Comments
 (0)