[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/emerge/bin/BuildSystem
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2009-07-31 21:41:40
Message-ID: 1249076500.799284.30556.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1005368 by habacker:

uses cmake directly for installing files, this goes much faster and produces correct \
install messages.  This also fixes install problems with running 'nmake install' from \
package build dir 

 M  +10 -18    CMakeBuildSystem.py  


--- trunk/kdesupport/emerge/bin/BuildSystem/CMakeBuildSystem.py #1005367:1005368
@@ -78,30 +78,22 @@
         utils.system( command ) or utils.die( "while Make'ing. cmd: %s" % command )
         return True
 
-    def __install( self, buildType=None ):
+    def install( self):
         """Using *make install"""
 
         self.enterBuildDir()
 
-        fastString = ""
-        if not self.noFast:
-            fastString = "/fast"
-        utils.system( "%s DESTDIR=%s install%s" % ( self.cmakeMakeProgramm, \
self.imageDir(), fastString ) ) or utils.die( "while installing. cmd: %s" % "%s \
DESTDIR=%s install" % ( self.cmakeMakeProgramm , self.imageDir() ) ) +        \
#fastString = "" +        #if not self.noFast:
+        #    fastString = "/fast"
+        #command = "%s DESTDIR=%s install%s" % ( self.cmakeMakeProgramm, \
self.imageDir(), fastString ) +        
+        command = "cmake -DCMAKE_INSTALL_PREFIX=%s -P cmake_install.cmake" % \
self.installDir() +        
+        utils.debug(command,1)
+        utils.system( command ) or utils.die( "while installing. cmd: %s" % command \
)  return True
 
-    def install( self ):
-        """making all required stuff for installing cmake based modules"""
-        if( not self.buildType() == None ):
-            if( not self.__install( self.buildType() ) ):
-                return False
-        else:
-            if( not self.__install( "debug" ) ):
-                return False
-            if( not self.__install( "release" ) ):
-                return False
-        utils.fixCmakeImageDir( self.imageDir(), self.rootdir )
-        return True
-
     def runTest( self ):
         """running cmake based unittests"""
 


[prev in list] [next in list] [prev in thread] [next in thread]