From ab4aa044e908614f37b931dfdb51f79da0b50e57 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sat, 22 May 2010 13:39:38 +0000 Subject: [PATCH] * ./goodies: - Bug: In coriolis2.spec.in, needs to add the CMAKE_MODULE_PATH component pointing into the %{buildroot} for tools to find their ".cmake". --- bootstrap/buildCoriolis.py | 2 +- bootstrap/coriolis2.spec.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index 4916750f..335d94d7 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -208,7 +208,7 @@ class ProjectBuilder: toolSourceDir = os.path.join ( self._sourceDir, tool ) toolBuildDir = os.path.join ( self._buildDir , tool ) # Supplied directly in the CMakeLists.txt. - #cmakeModules = os.path.join ( self._installDir, "share", "cmake_modules" ) + #cmakeModules = os.path.join ( self._installDir, "share", "cmake", "Modules" ) if not os.path.isdir(toolSourceDir): print "[ERROR] Missing tool source directory: \"%s\" (skipped)." % toolSourceDir diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in index 30d6e25e..e645a3de 100644 --- a/bootstrap/coriolis2.spec.in +++ b/bootstrap/coriolis2.spec.in @@ -66,6 +66,7 @@ Development files for the Coriolis 2 package. -D BUILD_SHARED_LIBS:STRING=ON \ -D BUILD_DOC:STRING=OFF \ -D CMAKE_INSTALL_PREFIX:STRING=%{coriolisTop} \ + -D CMAKE_MODULE_PATH:STRING=%{buildroot}%{coriolisTop}/share/cmake/Modules \ %ifarch x86_64 -D LIB_SUFFIX:STRING=64 \ %endif