diff options
| author | Alex Merry <kde@randomguy3.me.uk> | 2014-01-07 21:15:27 +0000 |
|---|---|---|
| committer | Alex Merry <kde@randomguy3.me.uk> | 2014-01-20 10:33:15 +0000 |
| commit | 2748a51aa61f6dbc93827e56d94ac92c9f0889b1 (patch) | |
| tree | 2acd43c087cd6f38038f92945bd24f5af9fd4dd1 | |
| parent | 9da6566f7f5989fabc768e5f08983759f90cfde2 (diff) | |
| download | extra-cmake-modules-2748a51aa61f6dbc93827e56d94ac92c9f0889b1.tar.gz extra-cmake-modules-2748a51aa61f6dbc93827e56d94ac92c9f0889b1.tar.bz2 | |
Remove KDE4 magic from _SET_FANCY in KDEInstallDirs.cmake
This appears to be a hangover from the KDE4 days, which would adjust
certain paths to match the ones for kdelibs if you installed an
application to the same prefix as kdelibs. This was probably to make
KStandardDirs work properly in unusual setups.
REVIEW: 114904
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 838a5238..46e15c17 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -100,13 +100,8 @@ endif() # additionally if installing to the same location as kdelibs, the other install # directories are reused from the installed kdelibs macro(_SET_FANCY _var _value _comment) - set(_predefinedvalue "${_value}") - if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "${KDE4_INSTALL_DIR}" AND DEFINED KDE4_${_var}) - set(_predefinedvalue "${KDE4_${_var}}") - endif() - if (NOT DEFINED ${_var}) - set(${_var} ${_predefinedvalue}) + set(${_var} ${_value}) else() set(${_var} "${${_var}}" CACHE STRING "${_comment}") endif() |