jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./goodies: 

- Bug: In coriolis2.spec.in, needs to add the CMAKE_MODULE_PATH component
        pointing into the %{buildroot} for tools to find their ".cmake".
This commit is contained in:
Jean-Paul Chaput 2010-05-22 13:39:38 +00:00
parent e4c1030407
commit ab4aa044e9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/buildCoriolis.py
View File

@ -208,7 +208,7 @@ class ProjectBuilder:
toolSourceDir = os.path.join ( self._sourceDir, tool ) toolSourceDir = os.path.join ( self._sourceDir, tool )
toolBuildDir = os.path.join ( self._buildDir , tool ) toolBuildDir = os.path.join ( self._buildDir , tool )
# Supplied directly in the CMakeLists.txt. # 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): if not os.path.isdir(toolSourceDir):
print "[ERROR] Missing tool source directory: \"%s\" (skipped)." % toolSourceDir print "[ERROR] Missing tool source directory: \"%s\" (skipped)." % toolSourceDir

1
bootstrap/coriolis2.spec.in
View File

@ -66,6 +66,7 @@ Development files for the Coriolis 2 package.
-D BUILD_SHARED_LIBS:STRING=ON \ -D BUILD_SHARED_LIBS:STRING=ON \
-D BUILD_DOC:STRING=OFF \ -D BUILD_DOC:STRING=OFF \
-D CMAKE_INSTALL_PREFIX:STRING=%{coriolisTop} \ -D CMAKE_INSTALL_PREFIX:STRING=%{coriolisTop} \
-D CMAKE_MODULE_PATH:STRING=%{buildroot}%{coriolisTop}/share/cmake/Modules \
%ifarch x86_64 %ifarch x86_64
-D LIB_SUFFIX:STRING=64 \ -D LIB_SUFFIX:STRING=64 \
%endif %endif