[jhbuild/mcatanzaro/cmake-prefix-path] cmake: set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/mcatanzaro/cmake-prefix-path] cmake: set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH
- Date: Thu, 25 Jul 2019 15:57:18 +0000 (UTC)
commit 26674a9d5c1fb099022473da4bc362ad4b04d726
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Thu Jul 25 10:55:51 2019 -0500
cmake: set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH
This tells CMake where to find dependencies, important for find modules
that don't use pkg-config.
See discussion at: https://bugs.webkit.org/show_bug.cgi?id=197934#c9
jhbuild/modtypes/cmake.py | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index 1df76bc9..552d95e9 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -95,6 +95,7 @@ class CMakeModule(MakeModule, NinjaModule, DownloadableModule):
if not inpath('cmake', os.environ['PATH'].split(os.pathsep)):
raise CommandError(_('%s not found') % 'cmake')
baseargs = '-DCMAKE_INSTALL_PREFIX=%s -DCMAKE_INSTALL_LIBDIR=lib' % prefix
+ baseargs += ' -DCMAKE_PREFIX_PATH=%s -DCMAKE_LIBRARY_PATH=%s' % (prefix, prefix + '/lib')
cmakeargs = self.get_cmakeargs()
if self.use_ninja:
baseargs += ' -G Ninja'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]