CMake: use PACKAGE_VERSION for the pkg-config file

Multimedia / Opus - DeadSix27 [users.noreply.github.com] - 19 January 2020 20:51 UTC

The old variable `OPUS_LIBRARY_VERSION`, does not line up with what's used in autoconf, which uses the PACKAGE_VERSION instead, which in turn lines up with what version the projects `opusfile` and `libsndfile` check for, for example. While at it, I also cleaned up the accidental double up in code.

###

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c9df248..ba86939a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,8 +326,7 @@ if(OPUS_INSTALL_PKG_CONFIG_MODULE)
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
- set(VERSION ${OPUS_LIBRARY_VERSION})
- set(VERSION ${OPUS_LIBRARY_VERSION})
+ set(VERSION ${PACKAGE_VERSION})
if(HAVE_LIBM)
set(LIBM "-lm")
endif()

6d29f51a CMake: use PACKAGE_VERSION for the pkg-config file
CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Upstream: git.xiph.org


  • Share