Skip to content

Commit 1bd03f0

Browse files
ilya-lavrenovlisanna-dettwyler
authored andcommitted
Proper installation rules
1 parent 2c7422d commit 1bd03f0

File tree

4 files changed

+16
-58
lines changed

4 files changed

+16
-58
lines changed

source/CMakeLists.txt

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,10 @@ endif()
4949
target_link_libraries(${TARGET_LOADER_NAME} utils)
5050

5151
install(TARGETS ze_loader
52-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
53-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
54-
LIBRARY
55-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
56-
COMPONENT level-zero
57-
NAMELINK_SKIP
58-
)
59-
60-
install(TARGETS ze_loader
61-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
62-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
63-
LIBRARY
64-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
65-
COMPONENT level-zero-devel
66-
NAMELINK_ONLY
52+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel
53+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero
54+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero
55+
NAMELINK_COMPONENT level-zero-devel
6756
)
6857

6958
if(UNIX)

source/drivers/null/CMakeLists.txt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,10 @@ target_include_directories(${TARGET_NAME}
2121

2222
if(INSTALL_NULL_DRIVER)
2323
install(TARGETS ze_null
24-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
25-
LIBRARY
26-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
27-
COMPONENT level-zero
28-
NAMELINK_SKIP
29-
)
30-
install(TARGETS ze_null
31-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
32-
LIBRARY
33-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
34-
COMPONENT level-zero-devel
35-
NAMELINK_ONLY
24+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel
25+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero
26+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero
27+
NAMELINK_COMPONENT level-zero-devel
3628
)
3729
endif()
3830

source/layers/tracing/CMakeLists.txt

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES
4949
)
5050

5151
install(TARGETS ze_tracing_layer
52-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
53-
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
54-
LIBRARY
55-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
56-
COMPONENT level-zero
57-
NAMELINK_SKIP
52+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel
53+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero
54+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero
55+
NAMELINK_COMPONENT level-zero-devel
5856
)
59-
60-
install(TARGETS ze_tracing_layer
61-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
62-
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
63-
LIBRARY
64-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
65-
COMPONENT level-zero-devel
66-
NAMELINK_ONLY
67-
)
68-

source/layers/validation/CMakeLists.txt

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,10 @@ set_target_properties(${TARGET_NAME} PROPERTIES
3737
)
3838

3939
install(TARGETS ze_validation_layer
40-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
41-
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
42-
LIBRARY
43-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
44-
COMPONENT level-zero
45-
NAMELINK_SKIP
46-
)
47-
48-
install(TARGETS ze_validation_layer
49-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
50-
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
51-
LIBRARY
52-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
53-
COMPONENT level-zero-devel
54-
NAMELINK_ONLY
40+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel
41+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero
42+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero
43+
NAMELINK_COMPONENT level-zero-devel
5544
)
5645

5746
add_subdirectory(handle_lifetime_tracking)

0 commit comments

Comments
 (0)