+ Provide download/build instructions for qt/5.4.2.
- This version provides updates to provided cmake scripts that are required
    for building cmake-gui.
+ Provide download/build instructions for version 3.5.0.
  - When building the +qt variant, add a validate function to ensure that
    qt-5.4.0 is not used (this version of qt has errors related to cmake).
			
			
This commit is contained in:
		@@ -30,6 +30,7 @@ class Cmake(Package):
 | 
			
		||||
    homepage  = 'https://www.cmake.org'
 | 
			
		||||
    url       = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz'
 | 
			
		||||
 | 
			
		||||
    version('3.5.0',    '33c5d09d4c33d4ffcc63578a6ba8777e')
 | 
			
		||||
    version('3.4.3',    '4cb3ff35b2472aae70f542116d616e63')
 | 
			
		||||
    version('3.4.0',    'cd3034e0a44256a0917e254167217fc8')
 | 
			
		||||
    version('3.3.1',    '52638576f4e1e621fed6c3410d3a1b12')
 | 
			
		||||
@@ -49,8 +50,25 @@ def url_for_version(self, version):
 | 
			
		||||
        """Handle CMake's version-based custom URLs."""
 | 
			
		||||
        return 'https://cmake.org/files/v%s/cmake-%s.tar.gz' % (version.up_to(2), version)
 | 
			
		||||
 | 
			
		||||
    def install(self, spec, prefix):
 | 
			
		||||
    def validate(self, spec):
 | 
			
		||||
        """
 | 
			
		||||
        Checks if incompatible versions of qt were specified
 | 
			
		||||
 | 
			
		||||
        :param spec: spec of the package
 | 
			
		||||
        :raises RuntimeError: in case of inconsistencies
 | 
			
		||||
        """
 | 
			
		||||
 | 
			
		||||
        print spec
 | 
			
		||||
 | 
			
		||||
        if '+qt' in spec and spec.satisfies('^qt@5.4.0'):
 | 
			
		||||
            msg = 'qt-5.4.0 has broken CMake modules.'
 | 
			
		||||
            raise RuntimeError(msg)
 | 
			
		||||
 | 
			
		||||
    def install(self, spec, prefix):
 | 
			
		||||
        # Consistency check
 | 
			
		||||
        self.validate(spec)
 | 
			
		||||
 | 
			
		||||
        # configure, build, install:
 | 
			
		||||
        options = ['--prefix=%s' % prefix]
 | 
			
		||||
        options.append('--parallel=%s' % str(make_jobs))
 | 
			
		||||
 | 
			
		||||
@@ -65,6 +83,5 @@ def install(self, spec, prefix):
 | 
			
		||||
        options.append('-DCMAKE_USE_OPENSSL=ON')
 | 
			
		||||
 | 
			
		||||
        configure(*options)
 | 
			
		||||
 | 
			
		||||
        make()
 | 
			
		||||
        make('install')
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,9 @@ class Qt(Package):
 | 
			
		||||
    list_url   = 'http://download.qt-project.org/official_releases/qt/'
 | 
			
		||||
    list_depth = 2
 | 
			
		||||
 | 
			
		||||
    version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5',
 | 
			
		||||
            url='http://download.qt-project.org/official_releases/qt/5.4/5.4.2/single/qt-everywhere-opensource-src-5.4.2.tar.gz')
 | 
			
		||||
 | 
			
		||||
    version('5.4.0', 'e8654e4b37dd98039ba20da7a53877e6',
 | 
			
		||||
            url='http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.tar.gz')
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user