X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=3028a427be2c02fa82a678d0fa0c66906e53d159;hp=c65f6be0e93a191ca26ce9763fba11594b3e02c3;hb=56d25331d61b4b24a2805f1cf16e68f722fdaf73;hpb=eaa1bd30bc088e5cae6d8a742d7aedb3d8ff1897 diff --git a/CMakeLists.txt b/CMakeLists.txt index c65f6be0..3028a427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,12 @@ project(QuasselIRC) # Versions set(QUASSEL_MAJOR 0) -set(QUASSEL_MINOR 12) +set(QUASSEL_MINOR 13) set(QUASSEL_PATCH 0) -set(QUASSEL_VERSION_STRING "0.12-pre") +set(QUASSEL_VERSION_STRING "0.13-pre") + +# We want to know CMake's version for debug reasons +message(STATUS "Using CMake ${CMAKE_VERSION}") # Tell CMake about or own modules set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -262,7 +265,7 @@ if (USE_QT5) endif() if (WITH_KDE) - find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig TextWidgets XmlGui QUIET) + find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig TextWidgets WidgetsAddons XmlGui QUIET) set_package_properties(KF5 PROPERTIES TYPE REQUIRED URL "http://www.kde.org" DESCRIPTION "KDE Frameworks" @@ -567,10 +570,10 @@ git_describe(GIT_DESCRIBE --long) # enviroment if (NOT GIT_HEAD OR NOT GIT_DESCRIBE) if (DEFINED ENV{GIT_HEAD}) - set(GIT_HEAD ${GIT_HEAD}) + set(GIT_HEAD $ENV{GIT_HEAD}) endif () if (DEFINED ENV{GIT_DESCRIBE}) - set(GIT_DESCRIBE ${GIT_DESCRIBE}) + set(GIT_DESCRIBE $ENV{GIT_DESCRIBE}) endif() endif()