projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Performance tweak: rem. pointless recursive calls
[quassel.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
9c5a5d4
..
3caf61e
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-11,8
+11,8
@@
project(QuasselIRC)
# Versions
set(QUASSEL_MAJOR 0)
set(QUASSEL_MINOR 12)
# Versions
set(QUASSEL_MAJOR 0)
set(QUASSEL_MINOR 12)
-set(QUASSEL_PATCH
0
)
-set(QUASSEL_VERSION_STRING "0.12
-rc1
")
+set(QUASSEL_PATCH
2
)
+set(QUASSEL_VERSION_STRING "0.12
.2
")
# We want to know CMake's version for debug reasons
message(STATUS "Using CMake ${CMAKE_VERSION}")
# We want to know CMake's version for debug reasons
message(STATUS "Using CMake ${CMAKE_VERSION}")
@@
-240,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
################
@@
-570,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()