X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=1a22fac958b7e2cddc8eb39790101df3ce7475be;hb=b106c6bd31960a4f70ceb696e9d9dc06a621b9f7;hp=d87397387ba4514065fa80e9fff329a49fe422dd;hpb=9e7ee3a501d5dce09982d92102b7f1873cd0d3db;p=quassel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d8739738..1a22fac9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,7 +240,11 @@ if (USE_QT5) ) 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 ################ @@ -570,10 +574,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()