New upstream version 3.9.5
This commit is contained in:
		
							parent
							
								
									62ea671738
								
							
						
					
					
						commit
						ca584f4bd5
					
				@ -240,8 +240,6 @@ if (NOT Boost_NO_BOOST_CMAKE)
 | 
			
		||||
      message("Found Boost components:")
 | 
			
		||||
      message("   ${Boost_FIND_COMPONENTS}")
 | 
			
		||||
    endif()
 | 
			
		||||
    # Restore project's policies
 | 
			
		||||
    cmake_policy(POP)
 | 
			
		||||
    return()
 | 
			
		||||
  endif()
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,5 @@
 | 
			
		||||
# CMake version number components.
 | 
			
		||||
set(CMake_VERSION_MAJOR 3)
 | 
			
		||||
set(CMake_VERSION_MINOR 9)
 | 
			
		||||
set(CMake_VERSION_PATCH 3)
 | 
			
		||||
set(CMake_VERSION_PATCH 5)
 | 
			
		||||
#set(CMake_VERSION_RC 0)
 | 
			
		||||
 | 
			
		||||
@ -1268,9 +1268,6 @@ bool cmQtAutoGenerators::MocGenerateAll(
 | 
			
		||||
             it != this->MocDefinitions.end(); ++it) {
 | 
			
		||||
          cmd.push_back("-D" + (*it));
 | 
			
		||||
        }
 | 
			
		||||
        // Add options
 | 
			
		||||
        cmd.insert(cmd.end(), this->MocOptions.begin(),
 | 
			
		||||
                   this->MocOptions.end());
 | 
			
		||||
        // Execute command
 | 
			
		||||
        if (!this->RunCommand(cmd, output, false)) {
 | 
			
		||||
          {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user