diff options
| author | Sebastian Kügler <sebas@kde.org> | 2015-09-29 01:12:13 +0300 |
|---|---|---|
| committer | Sebastian Kügler <sebas@kde.org> | 2015-09-29 01:15:39 +0300 |
| commit | a7cf1b04adf2398b3dad44004623a1730465b868 (patch) | |
| tree | 7c867d130e6c5b02979af313fa1723831f19ec6c /cmake | |
| parent | a08a90a718d502b1f5c271113ee19dcbad5c0db5 (diff) | |
Simplify creating the library path
Instead of checking whether the library path ends up somewhere in /usr,
set the architecture prefix, anyway. The library path mechanism is also
used in custom prefixes, without this change, the library gets installed
globally on Debian and Ubuntu, leading to non-standard behaviour and
cross-build problems, as multiple architecture builds of this library
can't be installed alongside each other.
This is the minimal change to correct this behaviour from upstream cmake.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/GNUInstallDirs.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cmake/modules/GNUInstallDirs.cmake b/cmake/modules/GNUInstallDirs.cmake index d868cb31c..5249477cb 100644 --- a/cmake/modules/GNUInstallDirs.cmake +++ b/cmake/modules/GNUInstallDirs.cmake @@ -134,13 +134,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set AND NOT CMAKE_CROSSCOMPILING) if (EXISTS "/etc/debian_version") # is this a debian system ? if(CMAKE_LIBRARY_ARCHITECTURE) - if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") - endif() - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX - AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") - set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") - endif() + set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") endif() else() # not debian, rely on CMAKE_SIZEOF_VOID_P: if(NOT DEFINED CMAKE_SIZEOF_VOID_P) |