Skip to content

Commit 76ceddb

Browse files
committed
Add version information to shared libs
1 parent 7e9c04b commit 76ceddb

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ GPUs from the command line.
1212

1313
### Added
1414
- VVC decode support to sample_decode
15+
- Embedded version information to all shared libraries
16+
17+
### Changed
18+
- Metrics monitor library to now build statically by default
1519

1620
## [1.1.0] - 2024-06-28
1721

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ message(
199199
message(
200200
STATUS " VPL_INSTALL_FULL_PYTHONDIR : ${VPL_INSTALL_FULL_PYTHONDIR}")
201201
message(STATUS "Build:")
202+
message(STATUS " BUILD_SHARED_LIBS : ${BUILD_SHARED_LIBS}")
202203
message(STATUS " BUILD_TESTS : ${BUILD_TESTS}")
203204
message(STATUS " BUILD_EXPERIMENTAL : ${BUILD_EXPERIMENTAL}")
204205
if(MSVC)

tools/legacy/metrics_monitor/CMakeLists.txt

+8-13
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,20 @@ if(PKG_LIBDRM_FOUND)
6060
set(DEPENDENCIES libdrm)
6161
set(METRICS_LIB cttmetrics)
6262

63-
add_library(${METRICS_LIB} SHARED ${sources})
63+
if(BUILD_SHARED_LIBS)
64+
add_library(${METRICS_LIB} SHARED ${sources})
65+
set_target_properties(${METRICS_LIB} PROPERTIES VERSION 1.0.0)
66+
install(TARGETS ${METRICS_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
67+
COMPONENT ${VPL_COMPONENT_TOOLS})
68+
else()
69+
add_library(${METRICS_LIB} STATIC ${sources})
70+
endif()
6471

6572
target_include_directories(${METRICS_LIB} PUBLIC include)
6673
target_link_libraries(${METRICS_LIB} PRIVATE PkgConfig::PKG_LIBDRM)
67-
6874
target_compile_definitions(${METRICS_LIB} PRIVATE LIBVA_DRM_SUPPORT
6975
LIBVA_SUPPORT)
7076

71-
# cttmetrics_static
72-
add_library(cttmetrics_static STATIC ${sources})
73-
74-
target_include_directories(cttmetrics_static PUBLIC include)
75-
target_link_libraries(cttmetrics_static PUBLIC PkgConfig::PKG_LIBDRM)
76-
77-
target_compile_definitions(cttmetrics_static PRIVATE LIBVA_DRM_SUPPORT
78-
LIBVA_SUPPORT)
79-
install(TARGETS ${METRICS_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
80-
COMPONENT ${VPL_COMPONENT_TOOLS})
81-
8277
# metrics_monitor
8378
set(sources sample/cttmetrics_sample.cpp)
8479
set(METRICS_TOOL metrics_monitor)

tools/legacy/sample_misc/wayland/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ pkg_check_modules(PKGConfig_LIBDRM libdrm>=2.4.91 IMPORTED_TARGET)
2525

2626
if(PKGConfig_LIBDRM_FOUND)
2727
add_library(${TARGET} SHARED)
28+
set_target_properties(${TARGET} PROPERTIES VERSION 1.0.0)
2829

2930
target_include_directories(
3031
${TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include

0 commit comments

Comments
 (0)