diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-05-25 03:07:41 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2018-06-05 17:33:22 +0200 |
| commit | 5cf0be9327c31da08fa200e043cf0d68666f20b6 (patch) | |
| tree | 7c3a33026d805d84784bff22e8f108037d8af3e2 | |
| parent | d3e51443c27ba0d0249be41235cc0af820f293bc (diff) | |
| download | extra-cmake-modules-5cf0be9327c31da08fa200e043cf0d68666f20b6.tar.gz extra-cmake-modules-5cf0be9327c31da08fa200e043cf0d68666f20b6.tar.bz2 | |
Don't include a 64 when building 64bit architectures on flatpak
Summary:
It's not a thing on flatpak and it makes packaging weird.
Should fix https://github.com/flatpak/freedesktop-sdk-base/issues/22
Reviewers: #frameworks, cgiboudeaux
Reviewed By: cgiboudeaux
Subscribers: cgiboudeaux, eszlari, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D13102
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 67218bf2..52b2eb21 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -235,13 +235,15 @@ set(_LIBDIR_DEFAULT "lib") # Override this default 'lib' with 'lib64' iff: # - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling # - we are NOT on debian +# - we are NOT on flatpak # - we are on a 64 bits system # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" # See http://wiki.debian.org/Multiarch if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") - AND NOT CMAKE_CROSSCOMPILING) + AND NOT CMAKE_CROSSCOMPILING + AND NOT DEFINED ENV{FLATPAK_ID}) if (EXISTS "/etc/debian_version") # is this a debian system ? if(CMAKE_LIBRARY_ARCHITECTURE) set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") |