Use LIBEXSLT_DOTTED_VERSION for exsltconfig.h.in and libexslt

GNOME · May 4, 2020 · e68b39e · e68b39e
1 parent cb3ccdd
commit e68b39e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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")