Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream source from tag 'upstream/3.9.5'

Browse Source 
Update to upstream version '3.9.5'
with Debian dir fe8e543b4673a7e0e844451a8a6cbbc788bbe60b
This commit is contained in:
Felix Geyer 2017-11-04 09:27:53 +01:00
commit 7a51ba197c
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindBoost.cmake
View File

@ -240,8 +240,6 @@ if (NOT Boost_NO_BOOST_CMAKE)
message("Found Boost components:") message("Found Boost components:")
message(" ${Boost_FIND_COMPONENTS}") message(" ${Boost_FIND_COMPONENTS}")
endif() endif()
# Restore project's policies
cmake_policy(POP)
return() return()
endif() endif()
endif() endif()

2
Source/CMakeVersion.cmake
View File

@ -1,5 +1,5 @@
# CMake version number components. # CMake version number components.
set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 9) set(CMake_VERSION_MINOR 9)
set(CMake_VERSION_PATCH 3) set(CMake_VERSION_PATCH 5)
#set(CMake_VERSION_RC 0) #set(CMake_VERSION_RC 0)

3
Source/cmQtAutoGenerators.cxx
View File

@ -1268,9 +1268,6 @@ bool cmQtAutoGenerators::MocGenerateAll(
it != this->MocDefinitions.end(); ++it) { it != this->MocDefinitions.end(); ++it) {
cmd.push_back("-D" + (*it)); cmd.push_back("-D" + (*it));
} }
// Add options
cmd.insert(cmd.end(), this->MocOptions.begin(),
this->MocOptions.end());
// Execute command // Execute command
if (!this->RunCommand(cmd, output, false)) { if (!this->RunCommand(cmd, output, false)) {
{ {