diff options
| author | Dominique Leuenberger <dimstar@opensuse.org> | 2016-01-18 20:45:54 +0100 |
|---|---|---|
| committer | Dominique Leuenberger <dimstar@opensuse.org> | 2016-01-18 20:45:54 +0100 |
| commit | e32975cba0b61626cca8661399f48596fb57f90e (patch) | |
| tree | ff73513f1bab3e8b08e1803753c32f2a3dc7fbf6 | |
| parent | 1b61cc253083b6190c1bd3fffe37d56093894938 (diff) | |
| parent | f30191930114cc334e02bb471f2c547198cad91c (diff) | |
| download | libproxy-git-e32975cba0b61626cca8661399f48596fb57f90e.tar.gz | |
Merge pull request #12 from rakuco/kde-runtime-dependency-only
config_kde: Decide whether to build the module based only on WITH_KDE.
| -rw-r--r-- | libproxy/cmake/modules.cmk | 2 | ||||
| -rw-r--r-- | libproxy/cmake/modules/config_kde.cmk | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk index 891cb07..d058876 100644 --- a/libproxy/cmake/modules.cmk +++ b/libproxy/cmake/modules.cmk @@ -32,7 +32,7 @@ px_module(config_envvar "${ENVVAR_FOUND}" 1) px_module(config_sysconfig "${SYSCONFIG_FOUND}" 1) px_module(config_gnome "${GNOME2_FOUND}" 0) px_module(config_gnome3 "${GNOME3_FOUND}" 0) -px_module(config_kde "${KDE_FOUND}" 0) +px_module(config_kde "${WITH_KDE} " 0) px_module(config_macosx "${SC_FOUND}" 1 ${SC_LIBRARIES} ${CF_LIBRARIES}) px_module(config_w32reg "${WIN32}" 1) px_module(ignore_domain 1 1) diff --git a/libproxy/cmake/modules/config_kde.cmk b/libproxy/cmake/modules/config_kde.cmk index 56c14b8..ed2f828 100644 --- a/libproxy/cmake/modules/config_kde.cmk +++ b/libproxy/cmake/modules/config_kde.cmk @@ -1,10 +1,4 @@ option(WITH_KDE "Build module to read proxy settings from KDE4/KF5" ON) -if (WITH_KDE) - find_program(KDE4_CONF kreadconfig) - find_program(KF5_CONF kreadconfig5) - - if (KDE4_CONF OR KF5_CONF) - set(KDE_FOUND 1) - endif() -endif() +# There are no additional detections; kreadconfig (from KDE4) and kreadconfig5 +# (from KF5) are only needed at runtime. |