Index: bin/info.py =================================================================== --- bin/info.py (revision 1047164) +++ bin/info.py (working copy) @@ -74,7 +74,7 @@ class OptionsCMake: def __init__(self): - self.useIDE = False + self.useIDE = True ## main option class class Options: Index: bin/BuildSystem/CMakeBuildSystem.py =================================================================== --- bin/BuildSystem/CMakeBuildSystem.py (revision 1047164) +++ bin/BuildSystem/CMakeBuildSystem.py (working copy) @@ -97,9 +97,9 @@ if self.compiler() == "msvc2008" and self.subinfo.options.cmake.useIDE: if self.subinfo.options.make.slnBaseName: - command = "start %s.sln" % self.subinfo.options.make.slnBaseName + command = "vcbuild /M2 %s.sln \"Debug|Win32\"" % self.subinfo.options.make.slnBaseName else: - command = "start %s.sln" % self.package + command = "vcbuild /M2 %s.sln \"Debug|Win32\"" % self.package else: command = self.makeProgramm @@ -122,14 +122,17 @@ if not self.noFast: fastString = "/fast" - if self.subinfo.options.install.useMakeToolForInstall == True: - command = "%s DESTDIR=%s install%s" % ( self.makeProgramm, self.installDir(), fastString ) + if self.subinfo.options.install.useMakeToolForInstall == True: + if self.compiler() == "msvc2008" and self.subinfo.options.cmake.useIDE: + command = "vcbuild INSTALL.vcproj \"Debug|Win32\"" + else: + command = "%s DESTDIR=%s install%s" % ( self.makeProgramm, self.installDir(), fastString ) else: command = "cmake -DCMAKE_INSTALL_PREFIX=%s -P cmake_install.cmake" % self.installDir() self.system( command, "install" ) - if self.subinfo.options.install.useMakeToolForInstall == True: + if self.subinfo.options.install.useMakeToolForInstall == True and not self.subinfo.options.cmake.useIDE: utils.fixCmakeImageDir( self.installDir(), self.mergeDestinationDir() ) return True