Commit d665c74f authored by Frederic Peters's avatar Frederic Peters
Browse files

Pass LIB_INSTALL_DIR when building cmake modules

parent 7a432e0c
......@@ -298,6 +298,7 @@ class Config:
libdir = os.path.join(self.prefix, 'lib64')
else:
libdir = os.path.join(self.prefix, 'lib')
self.libdir = libdir
addpath('LD_LIBRARY_PATH', libdir)
# LDFLAGS and C_INCLUDE_PATH are required for autoconf configure
......
......@@ -66,7 +66,9 @@ class CMakeModule(Package, DownloadableModule):
if not os.path.exists(builddir):
os.mkdir(builddir)
prefix = os.path.expanduser(buildscript.config.prefix)
cmd = ['cmake', '-DCMAKE_INSTALL_PREFIX=%s' % prefix, srcdir]
cmd = ['cmake', '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DLIB_INSTALL_DIR=%s' % buildscript.config.libdir,
srcdir]
buildscript.execute(cmd, cwd = builddir, extra_env = self.extra_env)
do_configure.depends = [PHASE_CHECKOUT]
do_configure.error_phases = [PHASE_FORCE_CHECKOUT]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment