Skip to content

Commit f880a6a

Browse files
committed
fix(cmake): keep cache internal deps out of installed export
1 parent f6d4f8f commit f880a6a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@ if (CACHE_SOURCES)
214214
PUBLIC
215215
${VIX_NET_TARGET}
216216
PRIVATE
217-
${VIX_JSON_TARGET}
217+
"$<BUILD_INTERFACE:${VIX_JSON_TARGET}>"
218218
)
219219

220220
if (TARGET vix_warnings)
221-
target_link_libraries(vix_cache PUBLIC vix_warnings)
221+
target_link_libraries(vix_cache PRIVATE "$<BUILD_INTERFACE:vix_warnings>")
222222
endif()
223223

224224
if (VIX_ENABLE_SANITIZERS AND TARGET vix_sanitizers)
225-
target_link_libraries(vix_cache PUBLIC vix_sanitizers)
225+
target_link_libraries(vix_cache PRIVATE "$<BUILD_INTERFACE:vix_sanitizers>")
226226
endif()
227227

228228
set_target_properties(vix_cache PROPERTIES
@@ -233,7 +233,7 @@ if (CACHE_SOURCES)
233233
)
234234

235235
install(TARGETS vix_cache
236-
EXPORT VixTargets
236+
EXPORT vix_cacheTargets
237237
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
238238
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
239239
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -302,8 +302,8 @@ install(FILES
302302
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vix_cache"
303303
)
304304

305-
install(EXPORT VixTargets
306-
FILE VixTargets.cmake
305+
install(EXPORT vix_cacheTargets
306+
FILE vix_cacheTargets.cmake
307307
NAMESPACE vix::
308308
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vix_cache"
309309
)

cmake/vix_cacheConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ include(CMakeFindDependencyMacro)
44

55
find_dependency(vix_net CONFIG REQUIRED)
66

7-
include("${CMAKE_CURRENT_LIST_DIR}/VixTargets.cmake")
7+
include("${CMAKE_CURRENT_LIST_DIR}/vix_cacheTargets.cmake")
88

99
check_required_components(vix_cache)

0 commit comments

Comments
 (0)