projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store the channel keys in CoreNetwork again
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
baf926d
..
1a22fac
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-10,9
+10,12
@@
project(QuasselIRC)
# Versions
set(QUASSEL_MAJOR 0)
# Versions
set(QUASSEL_MAJOR 0)
-set(QUASSEL_MINOR 1
2
)
+set(QUASSEL_MINOR 1
3
)
set(QUASSEL_PATCH 0)
set(QUASSEL_PATCH 0)
-set(QUASSEL_VERSION_STRING "0.12-beta1")
+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)
# Tell CMake about or own modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
@@
-237,7
+240,11
@@
if (USE_QT5)
)
endif()
endif()
)
endif()
endif()
- add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat")
+
+ if (WITH_WEBKIT AND Qt5WebKitWidgets_FOUND)
+ set(HAVE_WEBKIT true)
+ endif()
+ add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" HAVE_WEBKIT "Support showing previews for URLs in chat")
# KDE Frameworks
################
# KDE Frameworks
################
@@
-567,10
+574,10
@@
git_describe(GIT_DESCRIBE --long)
# enviroment
if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
if (DEFINED ENV{GIT_HEAD})
# 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})
endif ()
if (DEFINED ENV{GIT_DESCRIBE})
- set(GIT_DESCRIBE ${GIT_DESCRIBE})
+ set(GIT_DESCRIBE $
ENV
{GIT_DESCRIBE})
endif()
endif()
endif()
endif()