Commit fb0edced authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix error during merging

parent b827321e
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.14.0")
set(PIM_VERSION "5.14.40")
project(KIdentityManagement VERSION ${PIM_VERSION})
......@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
set(KIDENTITYMANAGEMENT_LIB_VERSION ${PIM_VERSION})
set(PIMTEXTEDIT_LIB_VERSION "5.14.0")
set(PIMTEXTEDIT_LIB_VERSION "5.14.40")
ecm_setup_version(PROJECT VARIABLE_PREFIX KIDENTITYMANAGEMENT
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kidentitymanagement_version.h"
......
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