Commit d3422348 authored by Johannes Zarl-Zierl's avatar Johannes Zarl-Zierl
Browse files

Remove *_LIB_VERSION_STRING alias for cmake *_LIB_VERSION variables

ECM only denotes the _VERSION_STRING variable as deprecated, so people
used to other projects will likely be more accustomed to the _VERSION
variable name.
parent db4a56de
......@@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES(
set(ASTRO_CMAKECONFIGNAME Astro)
set(ASTRO_LIB_VERSION ${PROJECT_VERSION})
set(ASTRO_LIB_VERSION_STRING ${PROJECT_VERSION})
set(ASTRO_LIB_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(ASTRO_LIB_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(ASTRO_LIB_VERSION_PATCH ${PROJECT_VERSION_PATCH})
......@@ -48,7 +47,7 @@ endif(WIN32)
if (NOT (CMAKE_SYSTEM_NAME STREQUAL Android))
set_target_properties(astro PROPERTIES
EXPORT_NAME "Astro"
VERSION ${ASTRO_LIB_VERSION_STRING}
VERSION ${ASTRO_LIB_VERSION}
SOVERSION ${ASTRO_LIB_SOVERSION}
)
endif()
......
......@@ -45,7 +45,6 @@ INCLUDE(layers/CMakeLists.txt)
INCLUDE(osm/CMakeLists.txt)
set(MARBLE_LIB_VERSION ${PROJECT_VERSION})
set(MARBLE_LIB_VERSION_STRING ${PROJECT_VERSION})
set(MARBLE_LIB_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(MARBLE_LIB_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(MARBLE_LIB_VERSION_PATCH ${PROJECT_VERSION_PATCH})
......@@ -444,7 +443,7 @@ set_target_properties(marblewidget PROPERTIES
if (NOT (CMAKE_SYSTEM_NAME STREQUAL Android))
set_target_properties(marblewidget PROPERTIES
VERSION ${MARBLE_LIB_VERSION_STRING}
VERSION ${MARBLE_LIB_VERSION}
SOVERSION ${MARBLE_LIB_SOVERSION}
)
endif()
......@@ -704,7 +703,7 @@ endif()
file(GENERATE
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qt_Marble.pri
CONTENT
"QT.Marble.VERSION = ${MARBLE_LIB_VERSION_STRING}
"QT.Marble.VERSION = ${MARBLE_LIB_VERSION}
QT.Marble.MAJOR_VERSION = ${MARBLE_LIB_VERSION_MAJOR}
QT.Marble.MINOR_VERSION = ${MARBLE_LIB_VERSION_MINOR}
QT.Marble.PATCH_VERSION = ${MARBLE_LIB_VERSION_PATCH}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment