X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=3caf61ec8774c049100bd343025563847ff41842;hb=79d10f90b17200eac2a977cc6ca5f70fed9da739;hp=ee91fe0dc27c6e72805d83494663a78abb062e7f;hpb=9c5e6c666d5faa976eec2e0ac8bf8e1dd6c0332c;p=quassel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index ee91fe0d..3caf61ec 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()