New upstream version 3.7.0

ci/unstable
Felix Geyer 8 years ago
parent 2ddf1d7f9e
commit 83e672b7ec

@ -193,7 +193,7 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
foreach (flag IN LISTS ${_prefix}_LDFLAGS) foreach (flag IN LISTS ${_prefix}_LDFLAGS)
if (flag MATCHES "^-L(.*)") if (flag MATCHES "^-L(.*)")
# only look into the given paths from now on # only look into the given paths from now on
set(_find_opts "HINTS ${${CMAKE_MATCH_1}} NO_DEFAULT_PATH") set(_find_opts HINTS ${CMAKE_MATCH_1} NO_DEFAULT_PATH)
continue() continue()
endif() endif()
if (flag MATCHES "^-l(.*)") if (flag MATCHES "^-l(.*)")

@ -2,4 +2,4 @@
set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 7) set(CMake_VERSION_MINOR 7)
set(CMake_VERSION_PATCH 0) set(CMake_VERSION_PATCH 0)
set(CMake_VERSION_RC 3) #set(CMake_VERSION_RC 0)

@ -455,8 +455,8 @@ static std::string ReadAll(const std::string& filename)
bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{ {
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilenameAbs.c_str()) || // If settings changed everything needs to be re-generated.
(this->OldCompileSettingsStr != this->CurrentCompileSettingsStr)) { if (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr) {
this->GenerateAll = true; this->GenerateAll = true;
} }

Binary file not shown.
Loading…
Cancel
Save