[libxslt] Use LIBEXSLT_DOTTED_VERSION for exsltconfig.h.in and libexslt
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Use LIBEXSLT_DOTTED_VERSION for exsltconfig.h.in and libexslt
- Date: Mon, 4 May 2020 16:27:33 +0000 (UTC)
commit e68b39eaeee2c778b4ae5ceee399f80052e2936e
Author: Markus Rickert <rickert fortiss org>
Date: Mon May 4 16:23:55 2020 +0200
Use LIBEXSLT_DOTTED_VERSION for exsltconfig.h.in and libexslt
CMakeLists.txt | 7 ++++---
libxslt-config.cmake.in | 5 +++++
2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dd0d4d6..7599c0ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,9 @@ set(LIBXSLT_DOTTED_VERSION "${LIBXSLT_MAJOR_VERSION}.${LIBXSLT_MINOR_VERSION}.${
math(EXPR LIBXSLT_VERSION_NUMBER "${LIBXSLT_MAJOR_VERSION} * 10000 + ${LIBXSLT_MINOR_VERSION} * 100 +
${LIBXSLT_MICRO_VERSION}")
set(LIBXSLT_VERSION_EXTRA "")
+set(VERSION ${LIBXSLT_DOTTED_VERSION})
+set(LIBEXSLT_VERSION ${LIBEXSLT_DOTTED_VERSION})
+
find_package(Iconv)
find_package(LibXml2)
find_package(Python2 COMPONENTS Interpreter Development)
@@ -154,9 +157,7 @@ else()
configure_file(config.h.cmake.in config.h)
endif()
-set(VERSION ${LIBEXSLT_DOTTED_VERSION})
configure_file(libexslt/exsltconfig.h.in libexslt/exsltconfig.h)
-set(VERSION ${LIBXSLT_DOTTED_VERSION})
configure_file(libxslt/xsltconfig.h.in libxslt/xsltconfig.h)
set(
@@ -339,7 +340,7 @@ set_target_properties(
OUTPUT_NAME exslt
POSITION_INDEPENDENT_CODE ON
PREFIX lib
- VERSION ${VERSION}
+ VERSION ${LIBEXSLT_VERSION}
)
if(WIN32)
diff --git a/libxslt-config.cmake.in b/libxslt-config.cmake.in
index 1803630f..ca71604b 100644
--- a/libxslt-config.cmake.in
+++ b/libxslt-config.cmake.in
@@ -3,6 +3,11 @@ set(LIBXSLT_VERSION_MAJOR "@LIBXSLT_MAJOR_VERSION@")
set(LIBXSLT_VERSION_MINOR "@LIBXSLT_MINOR_VERSION@")
set(LIBXSLT_VERSION_PATCH "@LIBXSLT_MICRO_VERSION@")
+set(LIBEXSLT_VERSION "@LIBEXSLT_VERSION@")
+set(LIBEXSLT_VERSION_MAJOR "@LIBEXSLT_MAJOR_VERSION@")
+set(LIBEXSLT_VERSION_MINOR "@LIBEXSLT_MINOR_VERSION@")
+set(LIBEXSLT_VERSION_PATCH "@LIBEXSLT_MICRO_VERSION@")
+
@PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/libxslt-export.cmake")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]