-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make cmake default to lib, not lib64
This fixes flatpak/flatpak-builder#93
- Loading branch information
1 parent
cdf1ee3
commit 6adb6f4
Showing
2 changed files
with
16 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
meta-freedesktop/recipes-devtools/cmake/cmake/cmake-nolib64.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff -up cmake-3.7.2/Modules/GNUInstallDirs.cmake.orig cmake-3.7.2/Modules/GNUInstallDirs.cmake | ||
--- cmake-3.7.2/Modules/GNUInstallDirs.cmake.orig 2017-01-13 15:05:41.000000000 +0100 | ||
+++ cmake-3.7.2/Modules/GNUInstallDirs.cmake 2018-01-09 10:11:33.308481602 +0100 | ||
@@ -210,9 +210,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR ( | ||
"Please enable at least one language before including GNUInstallDirs.") | ||
else() | ||
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") | ||
- set(_LIBDIR_DEFAULT "lib64") | ||
+ set(_LIBDIR_DEFAULT "lib") | ||
if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) | ||
- set(__LAST_LIBDIR_DEFAULT "lib64") | ||
+ set(__LAST_LIBDIR_DEFAULT "lib") | ||
endif() | ||
endif() | ||
endif() |