[jhbuild] cmake: pass -DCMAKE_INSTALL_LIBDIR=lib



commit ea83816720d05a910af8ebee6b8ce4bf31a7665f
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jun 27 21:51:07 2014 -0400

    cmake: pass -DCMAKE_INSTALL_LIBDIR=lib
    
    Similar in spirit to the bug in its python package, Fedora's cmake
    unconditionally installs libraries into the directory 'lib64', even
    outside of /usr.
    
    Add a define to force it back to our desired behaviour.

 jhbuild/modtypes/cmake.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index a6c8d4b..9db2f2b 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -77,7 +77,7 @@ class CMakeModule(MakeModule, DownloadableModule):
         prefix = os.path.expanduser(buildscript.config.prefix)
         if not inpath('cmake', os.environ['PATH'].split(os.pathsep)):
             raise CommandError(_('%s not found') % 'cmake')
-        baseargs = '-DCMAKE_INSTALL_PREFIX=%s' % prefix
+        baseargs = '-DCMAKE_INSTALL_PREFIX=%s -DCMAKE_INSTALL_LIBDIR=lib' % prefix
         cmakeargs = self.get_cmakeargs()
         # CMake on Windows generates VS projects or NMake makefiles by default.
         # When using MSYS "MSYS Makefiles" is the best guess. "Unix Makefiles"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]