fixed vars

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1376 17fca916-40b9-46aa-a4ea-0a15b648b75c

64 files changed, 129 insertions, 129 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 2e1c64d2c..9ae03a5e6 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -175,5 +175,5 @@ ADD_LIBRARY(kvilib SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS})
 TARGET_LINK_LIBRARIES(kvilib ${LIBS})
 
 # Installation directives
-SET_TARGET_PROPERTIES(kvilib PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvilib LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/lib)
+SET_TARGET_PROPERTIES(kvilib PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/lib)
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 41b420170..da6eb2058 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -431,10 +431,10 @@ SET(kvirc_SRCS
 QT4_WRAP_CPP(kvirc_MOC_SRCS ${kvirc_MOC_HDRS})
 
 # Create bin
-ADD_EXECUTABLE(${PACKAGE}-${MAJOR} ${kvirc_SRCS} ${kvirc_MOC_SRCS})
+ADD_EXECUTABLE(${PACKAGE}-${VERSION_MAJOR} ${kvirc_SRCS} ${kvirc_MOC_SRCS})
 
 # Link libraries
-TARGET_LINK_LIBRARIES(${PACKAGE}-${MAJOR} kvilib ${LIBS})
+TARGET_LINK_LIBRARIES(${PACKAGE}-${VERSION_MAJOR} kvilib ${LIBS})
 
 # Installation directives
-INSTALL(TARGETS ${PACKAGE}-${MAJOR} RUNTIME DESTINATION ${KVI_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/bin)
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index ecf6a906a..91b830aee 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMakeLists.txt for src/modules/
 IF(APPLE)
-	set(CMAKE_MODULE_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress")
+	SET(CMAKE_MODULE_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress")
 ENDIF()
 
 INCLUDE_DIRECTORIES(
@@ -29,7 +29,7 @@ SUBDIRS(
 	ident
 	lamerizer links list log logview
 	mask math mediaplayer mircimport my
-	objects 
+	objects
 	popupeditor
 	raweditor regchan reguser rijndael
 	setup sharedfile sharedfileswindow snd socketspy spaste str system
diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt
index e151b22ec..32853c57c 100644
--- a/src/modules/about/CMakeLists.txt
+++ b/src/modules/about/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviabout LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviabout LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/action/CMakeLists.txt b/src/modules/action/CMakeLists.txt
index 32d99b8ea..d72ff1139 100644
--- a/src/modules/action/CMakeLists.txt
+++ b/src/modules/action/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviaction LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviaction LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt
index e831a31a3..04d0c1d96 100644
--- a/src/modules/actioneditor/CMakeLists.txt
+++ b/src/modules/actioneditor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt
index aa15022a1..ab05a9592 100644
--- a/src/modules/addon/CMakeLists.txt
+++ b/src/modules/addon/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt
index 70658557a..f6b5851ae 100644
--- a/src/modules/aliaseditor/CMakeLists.txt
+++ b/src/modules/aliaseditor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/avatar/CMakeLists.txt b/src/modules/avatar/CMakeLists.txt
index 8322cee79..cc9fa34e9 100644
--- a/src/modules/avatar/CMakeLists.txt
+++ b/src/modules/avatar/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/chan/CMakeLists.txt b/src/modules/chan/CMakeLists.txt
index d8a32b02c..dd0b696c4 100644
--- a/src/modules/chan/CMakeLists.txt
+++ b/src/modules/chan/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvichan LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvichan LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt
index e5bf73b31..7ac0c7d41 100644
--- a/src/modules/channelsjoin/CMakeLists.txt
+++ b/src/modules/channelsjoin/CMakeLists.txt
@@ -24,5 +24,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/clock/CMakeLists.txt b/src/modules/clock/CMakeLists.txt
index 4a4bda797..c9bf89493 100644
--- a/src/modules/clock/CMakeLists.txt
+++ b/src/modules/clock/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviclock LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviclock LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt
index c87a76f0a..f9bfd76bc 100644
--- a/src/modules/codetester/CMakeLists.txt
+++ b/src/modules/codetester/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/config/CMakeLists.txt b/src/modules/config/CMakeLists.txt
index 5433f3348..35fb97bbb 100644
--- a/src/modules/config/CMakeLists.txt
+++ b/src/modules/config/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/context/CMakeLists.txt b/src/modules/context/CMakeLists.txt
index 1a3685beb..f925f4c6b 100644
--- a/src/modules/context/CMakeLists.txt
+++ b/src/modules/context/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
index 37d9b6a25..026cc81b5 100644
--- a/src/modules/dcc/CMakeLists.txt
+++ b/src/modules/dcc/CMakeLists.txt
@@ -59,5 +59,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/dialog/CMakeLists.txt b/src/modules/dialog/CMakeLists.txt
index 3a6ac2625..e4f7f19b9 100644
--- a/src/modules/dialog/CMakeLists.txt
+++ b/src/modules/dialog/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt
index 463d5abc0..19ea4bed4 100644
--- a/src/modules/editor/CMakeLists.txt
+++ b/src/modules/editor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt
index 83106cb11..2a9fbac7f 100644
--- a/src/modules/eventeditor/CMakeLists.txt
+++ b/src/modules/eventeditor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/file/CMakeLists.txt b/src/modules/file/CMakeLists.txt
index b264bc369..695034f15 100644
--- a/src/modules/file/CMakeLists.txt
+++ b/src/modules/file/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvifile LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvifile LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt
index 5b67e6bba..357231acc 100644
--- a/src/modules/filetransferwindow/CMakeLists.txt
+++ b/src/modules/filetransferwindow/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt
index 72fc3edc7..3745fe789 100644
--- a/src/modules/help/CMakeLists.txt
+++ b/src/modules/help/CMakeLists.txt
@@ -30,5 +30,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
index a8564b057..e40b1a234 100644
--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt
index 4f3e162e0..6d25fa435 100644
--- a/src/modules/ident/CMakeLists.txt
+++ b/src/modules/ident/CMakeLists.txt
@@ -29,5 +29,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviident LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviident LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt
index b48a0fa69..f4b0446dd 100644
--- a/src/modules/iograph/CMakeLists.txt
+++ b/src/modules/iograph/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/lamerizer/CMakeLists.txt b/src/modules/lamerizer/CMakeLists.txt
index c7bb7c9c9..5c9b9eeca 100644
--- a/src/modules/lamerizer/CMakeLists.txt
+++ b/src/modules/lamerizer/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt
index fc36084b6..ef3f96931 100644
--- a/src/modules/links/CMakeLists.txt
+++ b/src/modules/links/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt
index a4895f4fe..9094ad38e 100644
--- a/src/modules/list/CMakeLists.txt
+++ b/src/modules/list/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvilist LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvilist LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/log/CMakeLists.txt b/src/modules/log/CMakeLists.txt
index 586eafd8b..5651d0210 100644
--- a/src/modules/log/CMakeLists.txt
+++ b/src/modules/log/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvilog LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvilog LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt
index 1425054b4..62faf4a48 100644
--- a/src/modules/logview/CMakeLists.txt
+++ b/src/modules/logview/CMakeLists.txt
@@ -28,5 +28,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/mask/CMakeLists.txt b/src/modules/mask/CMakeLists.txt
index 6b1c49d46..7dec42962 100644
--- a/src/modules/mask/CMakeLists.txt
+++ b/src/modules/mask/CMakeLists.txt
@@ -18,5 +18,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvimask LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvimask LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/math/CMakeLists.txt b/src/modules/math/CMakeLists.txt
index fa952d9a0..3be3dacc0 100644
--- a/src/modules/math/CMakeLists.txt
+++ b/src/modules/math/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvimath LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvimath LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt
index 414363f13..529d284d7 100644
--- a/src/modules/mediaplayer/CMakeLists.txt
+++ b/src/modules/mediaplayer/CMakeLists.txt
@@ -42,5 +42,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/mircimport/CMakeLists.txt b/src/modules/mircimport/CMakeLists.txt
index a710dc926..88fdd398a 100644
--- a/src/modules/mircimport/CMakeLists.txt
+++ b/src/modules/mircimport/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt
index 31c172e45..98b0258e5 100644
--- a/src/modules/my/CMakeLists.txt
+++ b/src/modules/my/CMakeLists.txt
@@ -28,5 +28,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvimy LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvimy LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt
index 3b5bff757..01a1cd45b 100644
--- a/src/modules/notifier/CMakeLists.txt
+++ b/src/modules/notifier/CMakeLists.txt
@@ -37,5 +37,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 8e43ade54..cfc72a91c 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -114,5 +114,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index 523323d97..81e032607 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -112,5 +112,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/perl/CMakeLists.txt b/src/modules/perl/CMakeLists.txt
index 5bcebd934..f13c779d1 100644
--- a/src/modules/perl/CMakeLists.txt
+++ b/src/modules/perl/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviperl LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviperl LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt
index e05173e8d..445a3df3e 100644
--- a/src/modules/perlcore/CMakeLists.txt
+++ b/src/modules/perlcore/CMakeLists.txt
@@ -45,5 +45,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt
index 465c4032f..e41aea74b 100644
--- a/src/modules/popupeditor/CMakeLists.txt
+++ b/src/modules/popupeditor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt
index c4d3379e7..bb4842539 100644
--- a/src/modules/raweditor/CMakeLists.txt
+++ b/src/modules/raweditor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/regchan/CMakeLists.txt b/src/modules/regchan/CMakeLists.txt
index 61c7afbad..96c5d89dc 100644
--- a/src/modules/regchan/CMakeLists.txt
+++ b/src/modules/regchan/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt
index 299c16741..7d4e15c47 100644
--- a/src/modules/reguser/CMakeLists.txt
+++ b/src/modules/reguser/CMakeLists.txt
@@ -30,5 +30,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt
index 2011f60fd..54ee13eda 100644
--- a/src/modules/rijndael/CMakeLists.txt
+++ b/src/modules/rijndael/CMakeLists.txt
@@ -29,5 +29,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt
index ef19f84f9..7733cd8b6 100644
--- a/src/modules/setup/CMakeLists.txt
+++ b/src/modules/setup/CMakeLists.txt
@@ -30,5 +30,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/sharedfile/CMakeLists.txt b/src/modules/sharedfile/CMakeLists.txt
index 4a88337fe..f2188d615 100644
--- a/src/modules/sharedfile/CMakeLists.txt
+++ b/src/modules/sharedfile/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt
index 40b601bec..b299baa36 100644
--- a/src/modules/sharedfileswindow/CMakeLists.txt
+++ b/src/modules/sharedfileswindow/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/snd/CMakeLists.txt b/src/modules/snd/CMakeLists.txt
index 6c578407c..adee34cb0 100644
--- a/src/modules/snd/CMakeLists.txt
+++ b/src/modules/snd/CMakeLists.txt
@@ -29,5 +29,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt
index fbe1c9138..a8850de04 100644
--- a/src/modules/socketspy/CMakeLists.txt
+++ b/src/modules/socketspy/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt
index c388b7f14..f05544bae 100644
--- a/src/modules/spaste/CMakeLists.txt
+++ b/src/modules/spaste/CMakeLists.txt
@@ -27,5 +27,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt
index b4b570eb9..1043a1446 100644
--- a/src/modules/str/CMakeLists.txt
+++ b/src/modules/str/CMakeLists.txt
@@ -30,5 +30,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvistr LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvistr LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt
index ea95dde3e..ac1cb51c5 100644
--- a/src/modules/system/CMakeLists.txt
+++ b/src/modules/system/CMakeLists.txt
@@ -26,6 +26,6 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
 
diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt
index 985a9e05d..3ac8089f9 100644
--- a/src/modules/term/CMakeLists.txt
+++ b/src/modules/term/CMakeLists.txt
@@ -28,5 +28,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviterm LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviterm LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/texticons/CMakeLists.txt b/src/modules/texticons/CMakeLists.txt
index 0a22c7549..97a939438 100644
--- a/src/modules/texticons/CMakeLists.txt
+++ b/src/modules/texticons/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt
index a3666431e..c8c583266 100644
--- a/src/modules/theme/CMakeLists.txt
+++ b/src/modules/theme/CMakeLists.txt
@@ -32,5 +32,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt
index c6fd454ce..5ff803ac8 100644
--- a/src/modules/tip/CMakeLists.txt
+++ b/src/modules/tip/CMakeLists.txt
@@ -25,5 +25,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitip LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitip LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/tmphighlight/CMakeLists.txt b/src/modules/tmphighlight/CMakeLists.txt
index 9542107fb..58116ee3f 100644
--- a/src/modules/tmphighlight/CMakeLists.txt
+++ b/src/modules/tmphighlight/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/toolbar/CMakeLists.txt b/src/modules/toolbar/CMakeLists.txt
index 6cfc7730a..cc5b559b7 100644
--- a/src/modules/toolbar/CMakeLists.txt
+++ b/src/modules/toolbar/CMakeLists.txt
@@ -21,5 +21,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt
index 7e0fd82a9..6d78574ec 100644
--- a/src/modules/toolbareditor/CMakeLists.txt
+++ b/src/modules/toolbareditor/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt
index e5ba0b4fb..0a78c5a2d 100644
--- a/src/modules/torrent/CMakeLists.txt
+++ b/src/modules/torrent/CMakeLists.txt
@@ -30,5 +30,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt
index 9b46fddcc..1bea7d98c 100644
--- a/src/modules/trayicon/CMakeLists.txt
+++ b/src/modules/trayicon/CMakeLists.txt
@@ -30,5 +30,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt
index 2bf78a4a4..53ad59b4d 100644
--- a/src/modules/url/CMakeLists.txt
+++ b/src/modules/url/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviurl LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviurl LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)
diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt
index fa54d524b..2ca7251f2 100644
--- a/src/modules/window/CMakeLists.txt
+++ b/src/modules/window/CMakeLists.txt
@@ -26,5 +26,5 @@ ELSE()
 ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
-INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
+SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
+INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/)