Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-05-17 22:01:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2014-05-06 13:39:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-05-17 22:01:37.000000000 +0200 @@ -1,0 +2,25 @@ +Wed May 14 15:42:17 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 3.0.0~rc5 + * Utilities/Sphinx: Fix cmake domain document removal with python3 + * Utilities/Sphinx: Add option to build 'singlehtml' format + * Restore --help-full option to output all help manuals + * ExternalProject: Fix path to cmake in verify script + * KWSys SystemInformation: Include backtrace APIs whenever we use them + * ctest_build: Do not crash on bad generator name + * cmTarget: Drop unused GetProperty signature + * cmTarget: Evaluate CMP0026 in calling context + * Ninja: Fix deptype for Intel compiler on Linux + * VS: Fix /MANIFESTUAC:NO linker option mapping + * InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903) + * cmake-gui: Fix desktop file icon configuration + * FindCurses: Honor CURSES_NEED_NCURSES when curses is found + * FindCurses: Detect and satisfy ncurses dependency on tinfo + * CompileFlags: Test for C++ features after selecting flags + * CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC + * CompileFlags: add better selection which aCC version gets -AA + +hpxstd98 flags + * OS X: Fix Info.plist placement in a CFBundle + * Utilities/Sphinx: Port documentation generation to python3 (#14886) + +------------------------------------------------------------------- cmake.changes: same change Old: ---- cmake-3.0.0-rc4.tar.gz New: ---- cmake-3.0.0-rc5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.evPx3L/_old 2014-05-17 22:01:38.000000000 +0200 +++ /var/tmp/diff_new_pack.evPx3L/_new 2014-05-17 22:01:38.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake-gui -Version: 3.0.0~rc4 +Version: 3.0.0~rc5 Release: 0 -%define rversion 3.0.0-rc4 +%define rversion 3.0.0-rc5 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/cmake-%{rversion}.tar.gz Summary: CMake graphical user interface ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.evPx3L/_old 2014-05-17 22:01:38.000000000 +0200 +++ /var/tmp/diff_new_pack.evPx3L/_new 2014-05-17 22:01:38.000000000 +0200 @@ -17,9 +17,9 @@ Name: cmake -Version: 3.0.0~rc4 +Version: 3.0.0~rc5 Release: 0 -%define rversion 3.0.0-rc4 +%define rversion 3.0.0-rc5 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v3.0/%{name}-%{rversion}.tar.gz Source1: cmake.macros ++++++ cmake-3.0.0-rc4.tar.gz -> cmake-3.0.0-rc5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/CompileFlags.cmake new/cmake-3.0.0-rc5/CompileFlags.cmake --- old/cmake-3.0.0-rc4/CompileFlags.cmake 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/CompileFlags.cmake 2014-05-13 17:15:35.000000000 +0200 @@ -19,7 +19,6 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 6") set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) endif() -include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$") set(_INTEL_WINDOWS 1) @@ -54,6 +53,18 @@ endif() endif() +if(CMAKE_SYSTEM_NAME MATCHES "HP-UX" AND CMAKE_CXX_COMPILER_ID MATCHES "HP") + # HP aCC since version 3.80 supports the flag +hpxstd98 to get ANSI C++98 + # template support. It is known that version 6.25 doesn't need that flag. + # Versions prior to 3.80 will not be able to build CMake. Current assumption: + # it is needed for every version from 3.80 to 4 to get it working. + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4 AND + NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.80) + # use new C++ library and improved template support + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA +hpxstd98") + endif() +endif() + # use the ansi CXX compile flag for building cmake if (CMAKE_ANSI_CXXFLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}") @@ -68,3 +79,5 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") endif () + +include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Help/manual/OPTIONS_HELP.txt new/cmake-3.0.0-rc5/Help/manual/OPTIONS_HELP.txt --- old/cmake-3.0.0-rc4/Help/manual/OPTIONS_HELP.txt 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Help/manual/OPTIONS_HELP.txt 2014-05-13 17:15:35.000000000 +0200 @@ -11,6 +11,12 @@ If a file is specified, the version is written into it. |file| +``--help-full [<f>]`` + Print all help manuals and exit. + + All manuals are printed in a human-readable text format. + |file| + ``--help-manual <man> [<f>]`` Print one help manual and exit. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Modules/ExternalProject.cmake new/cmake-3.0.0-rc5/Modules/ExternalProject.cmake --- old/cmake-3.0.0-rc4/Modules/ExternalProject.cmake 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Modules/ExternalProject.cmake 2014-05-13 17:15:35.000000000 +0200 @@ -605,7 +605,7 @@ Retrying download. \") file(REMOVE \"\${file}\") - execute_process(COMMAND ${CMAKE_COMMAND} -P \"${download_script}\") + execute_process(COMMAND \${CMAKE_COMMAND} -P \"${download_script}\") endif() endwhile() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Modules/FindCurses.cmake new/cmake-3.0.0-rc5/Modules/FindCurses.cmake --- old/cmake-3.0.0-rc4/Modules/FindCurses.cmake 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Modules/FindCurses.cmake 2014-05-13 17:15:35.000000000 +0200 @@ -40,7 +40,7 @@ find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) set(CURSES_USE_NCURSES FALSE) -if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) +if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) set(CURSES_USE_NCURSES TRUE) endif() # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html @@ -135,10 +135,20 @@ CACHE FILEPATH "The curses library" ${FORCE_IT}) endif() + CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" + cbreak "" CURSES_NCURSES_HAS_CBREAK) + if(NOT CURSES_NCURSES_HAS_CBREAK) + find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}") + find_library(CURSES_EXTRA_LIBRARY tinfo ) + CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}" + cbreak "" CURSES_TINFO_HAS_CBREAK) + endif() endif() -find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") -find_library(CURSES_EXTRA_LIBRARY cur_colr ) +if (NOT CURSES_TINFO_HAS_CBREAK) + find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") + find_library(CURSES_EXTRA_LIBRARY cur_colr ) +endif() find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") find_library(CURSES_FORM_LIBRARY form ) @@ -182,5 +192,7 @@ CURSES_INCLUDE_DIR CURSES_CURSES_HAS_WSYNCUP CURSES_NCURSES_HAS_WSYNCUP + CURSES_NCURSES_HAS_CBREAK + CURSES_TINFO_HAS_CBREAK ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Modules/InstallRequiredSystemLibraries.cmake new/cmake-3.0.0-rc5/Modules/InstallRequiredSystemLibraries.cmake --- old/cmake-3.0.0-rc4/Modules/InstallRequiredSystemLibraries.cmake 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Modules/InstallRequiredSystemLibraries.cmake 2014-05-13 17:15:35.000000000 +0200 @@ -295,25 +295,42 @@ macro(MFC_FILES_FOR_VERSION version) set(v "${version}") + # Multi-Byte Character Set versions of MFC are available as optional + # addon since Visual Studio 12. So for version 12 or higher, check + # whether they are available and exclude them if they are not. + if("${v}" LESS 12 OR EXISTS "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll") + set(mbcs ON) + else() + set(mbcs OFF) + endif() + if(CMAKE_INSTALL_DEBUG_LIBRARIES) set(MSVC${v}_MFC_DIR "${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugMFC") set(__install__libs ${__install__libs} - "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll" "${MSVC${v}_MFC_DIR}/mfc${v}0ud.dll" - "${MSVC${v}_MFC_DIR}/mfcm${v}0d.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0ud.dll" ) + if(mbcs) + set(__install__libs ${__install__libs} + "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll" + "${MSVC${v}_MFC_DIR}/mfcm${v}0d.dll" + ) + endif() endif() set(MSVC${v}_MFC_DIR "${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.MFC") if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY) set(__install__libs ${__install__libs} - "${MSVC${v}_MFC_DIR}/mfc${v}0.dll" "${MSVC${v}_MFC_DIR}/mfc${v}0u.dll" - "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0u.dll" ) + if(mbcs) + set(__install__libs ${__install__libs} + "${MSVC${v}_MFC_DIR}/mfc${v}0.dll" + "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll" + ) + endif() endif() # include the language dll's as well as the actuall dll's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/CMakeVersion.cmake new/cmake-3.0.0-rc5/Source/CMakeVersion.cmake --- old/cmake-3.0.0-rc4/Source/CMakeVersion.cmake 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/CMakeVersion.cmake 2014-05-13 17:15:35.000000000 +0200 @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 4) +set(CMake_VERSION_RC 5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/CTest/cmCTestBuildCommand.cxx new/cmake-3.0.0-rc5/Source/CTest/cmCTestBuildCommand.cxx --- old/cmake-3.0.0-rc4/Source/CTest/cmCTestBuildCommand.cxx 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/CTest/cmCTestBuildCommand.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -113,6 +113,15 @@ this->GlobalGenerator = this->Makefile->GetCMakeInstance()->CreateGlobalGenerator( cmakeGeneratorName); + if(!this->GlobalGenerator) + { + std::string e = "could not create generator named \""; + e += cmakeGeneratorName; + e += "\""; + this->Makefile->IssueMessage(cmake::FATAL_ERROR, e); + cmSystemTools::SetFatalErrorOccured(); + return 0; + } } if(strlen(cmakeBuildConfiguration) == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/QtDialog/CMake.desktop new/cmake-3.0.0-rc5/Source/QtDialog/CMake.desktop --- old/cmake-3.0.0-rc4/Source/QtDialog/CMake.desktop 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/QtDialog/CMake.desktop 2014-05-13 17:15:35.000000000 +0200 @@ -3,7 +3,7 @@ Name=CMake Comment=Cross-platform buildsystem Exec=cmake-gui %f -Icon=CMakeSetup32.png +Icon=CMakeSetup32 Terminal=false X-MultipleArgs=false Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmDocumentation.cxx new/cmake-3.0.0-rc5/Source/cmDocumentation.cxx --- old/cmake-3.0.0-rc4/Source/cmDocumentation.cxx 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmDocumentation.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -30,6 +30,8 @@ "Print usage information and exit."}, {"--version,-version,/V [<f>]", "Print version number and exit."}, + {"--help-full [<f>]", + "Print all help manuals and exit."}, {"--help-manual <man> [<f>]", "Print one help manual and exit."}, {"--help-manual-list [<f>]", @@ -112,6 +114,8 @@ { case cmDocumentation::Usage: return this->PrintDocumentationUsage(os); + case cmDocumentation::Full: + return this->PrintHelpFull(os); case cmDocumentation::OneManual: return this->PrintHelpOneManual(os); case cmDocumentation::OneCommand: @@ -364,9 +368,9 @@ } else if(strcmp(argv[i], "--help-full") == 0) { + help.HelpType = cmDocumentation::Full; GET_OPT_ARGUMENT(help.Filename); - cmSystemTools::Message("Warning: --help-full no longer supported"); - return true; + this->WarnFormFromFilename(help, result); } else if(strcmp(argv[i], "--help-html") == 0) { @@ -678,6 +682,12 @@ } //---------------------------------------------------------------------------- +bool cmDocumentation::PrintHelpFull(std::ostream& os) +{ + return this->PrintFiles(os, "index"); +} + +//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOneManual(std::ostream& os) { std::string mname = this->CurrentArgument; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmDocumentation.h new/cmake-3.0.0-rc5/Source/cmDocumentation.h --- old/cmake-3.0.0-rc4/Source/cmDocumentation.h 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmDocumentation.h 2014-05-13 17:15:35.000000000 +0200 @@ -102,6 +102,7 @@ bool PrintFiles(std::ostream& os, std::string const& pattern); bool PrintVersion(std::ostream& os); + bool PrintHelpFull(std::ostream& os); bool PrintHelpOneManual(std::ostream& os); bool PrintHelpOneCommand(std::ostream& os); bool PrintHelpOneModule(std::ostream& os); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmDocumentationFormatter.h new/cmake-3.0.0-rc5/Source/cmDocumentationFormatter.h --- old/cmake-3.0.0-rc4/Source/cmDocumentationFormatter.h 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmDocumentationFormatter.h 2014-05-13 17:15:35.000000000 +0200 @@ -26,7 +26,7 @@ /** Types of help provided. */ enum Type { - None, Version, Usage, ListManuals, + None, Version, Usage, Full, ListManuals, ListCommands, ListModules, ListProperties, ListVariables, ListPolicies, OneManual, OneCommand, OneModule, OneProperty, OneVariable, OnePolicy, OldCustomModules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmGetPropertyCommand.cxx new/cmake-3.0.0-rc5/Source/cmGetPropertyCommand.cxx --- old/cmake-3.0.0-rc4/Source/cmGetPropertyCommand.cxx 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmGetPropertyCommand.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -302,7 +302,8 @@ } if(cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { - return this->StoreResult(target->GetProperty(this->PropertyName.c_str())); + return this->StoreResult(target->GetProperty(this->PropertyName.c_str(), + this->Makefile)); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmGetTargetPropertyCommand.cxx new/cmake-3.0.0-rc5/Source/cmGetTargetPropertyCommand.cxx --- old/cmake-3.0.0-rc4/Source/cmGetTargetPropertyCommand.cxx 2014-04-16 19:54:40.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmGetTargetPropertyCommand.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -38,7 +38,7 @@ else if(cmTarget* tgt = this->Makefile->FindTargetToUse(targetName)) { cmTarget& target = *tgt; - prop = target.GetProperty(args[2].c_str()); + prop = target.GetProperty(args[2].c_str(), this->Makefile); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmNinjaTargetGenerator.cxx new/cmake-3.0.0-rc5/Source/cmNinjaTargetGenerator.cxx --- old/cmake-3.0.0-rc4/Source/cmNinjaTargetGenerator.cxx 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmNinjaTargetGenerator.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -369,8 +369,10 @@ const std::string cId = mf->GetDefinition("CMAKE_C_COMPILER_ID") ? mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") : mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"); - - const bool usingMSVC = (cId == "MSVC" || cId == "Intel"); + const std::string sId = mf->GetDefinition("CMAKE_C_SIMULATE_ID") + ? mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID") + : mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"); + const bool usingMSVC = (cId == "MSVC" || sId == "MSVC"); // Tell ninja dependency format so all deps can be loaded into a database std::string deptype; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmOSXBundleGenerator.cxx new/cmake-3.0.0-rc5/Source/cmOSXBundleGenerator.cxx --- old/cmake-3.0.0-rc4/Source/cmOSXBundleGenerator.cxx 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmOSXBundleGenerator.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -178,7 +178,7 @@ // Configure the Info.plist file. Note that it needs the executable name // to be set. - std::string plist = + std::string plist = root + "/" + this->Target->GetCFBundleDirectory(this->ConfigName, true); plist += "/Info.plist"; this->LocalGenerator->GenerateAppleInfoPList(this->Target, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmTarget.cxx new/cmake-3.0.0-rc5/Source/cmTarget.cxx --- old/cmake-3.0.0-rc4/Source/cmTarget.cxx 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmTarget.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -2624,13 +2624,7 @@ } //---------------------------------------------------------------------------- -const char *cmTarget::GetProperty(const char* prop) const -{ - return this->GetProperty(prop, cmProperty::TARGET); -} - -//---------------------------------------------------------------------------- -bool cmTarget::HandleLocationPropertyPolicy() const +bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const { if (this->IsImported()) { @@ -2639,7 +2633,7 @@ cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; - switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0026)) + switch (context->GetPolicyStatus(cmPolicies::CMP0026)) { case cmPolicies::WARN: e << (this->Makefile->GetPolicies() @@ -2660,15 +2654,21 @@ << this->GetName() << "\". Use the target name directly with " "add_custom_command, or use the generator expression $<TARGET_FILE>, " "as appropriate.\n"; - this->Makefile->IssueMessage(messageType, e.str().c_str()); + context->IssueMessage(messageType, e.str().c_str()); } return messageType != cmake::FATAL_ERROR; } //---------------------------------------------------------------------------- +const char *cmTarget::GetProperty(const char* prop) const +{ + return this->GetProperty(prop, this->Makefile); +} + +//---------------------------------------------------------------------------- const char *cmTarget::GetProperty(const char* prop, - cmProperty::ScopeType scope) const + cmMakefile* context) const { if(!prop) { @@ -2681,7 +2681,7 @@ cmOStringStream e; e << "INTERFACE_LIBRARY targets may only have whitelisted properties. " "The property \"" << prop << "\" is not allowed."; - this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str().c_str()); + context->IssueMessage(cmake::FATAL_ERROR, e.str().c_str()); return 0; } @@ -2700,7 +2700,7 @@ { if(strcmp(prop,"LOCATION") == 0) { - if (!this->HandleLocationPropertyPolicy()) + if (!this->HandleLocationPropertyPolicy(context)) { return 0; } @@ -2721,7 +2721,7 @@ // Support "LOCATION_<CONFIG>". if(cmHasLiteralPrefix(prop, "LOCATION_")) { - if (!this->HandleLocationPropertyPolicy()) + if (!this->HandleLocationPropertyPolicy(context)) { return 0; } @@ -2736,7 +2736,7 @@ std::string configName(prop, strlen(prop) - 9); if(configName != "IMPORTED") { - if (!this->HandleLocationPropertyPolicy()) + if (!this->HandleLocationPropertyPolicy(context)) { return 0; } @@ -2857,10 +2857,10 @@ } bool chain = false; const char *retVal = - this->Properties.GetPropertyValue(prop, scope, chain); + this->Properties.GetPropertyValue(prop, cmProperty::TARGET, chain); if (chain) { - return this->Makefile->GetProperty(prop,scope); + return this->Makefile->GetProperty(prop, cmProperty::TARGET); } return retVal; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmTarget.h new/cmake-3.0.0-rc5/Source/cmTarget.h --- old/cmake-3.0.0-rc4/Source/cmTarget.h 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmTarget.h 2014-05-13 17:15:35.000000000 +0200 @@ -257,7 +257,7 @@ void SetProperty(const char *prop, const char *value); void AppendProperty(const char* prop, const char* value,bool asString=false); const char *GetProperty(const char *prop) const; - const char *GetProperty(const char *prop, cmProperty::ScopeType scope) const; + const char *GetProperty(const char *prop, cmMakefile* context) const; bool GetPropertyAsBool(const char *prop) const; void CheckProperty(const char* prop, cmMakefile* context) const; @@ -580,7 +580,7 @@ const std::string &compatibilityType) const; private: - bool HandleLocationPropertyPolicy() const; + bool HandleLocationPropertyPolicy(cmMakefile* context) const; // The set of include directories that are marked as system include // directories. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmVS10LinkFlagTable.h new/cmake-3.0.0-rc5/Source/cmVS10LinkFlagTable.h --- old/cmake-3.0.0-rc4/Source/cmVS10LinkFlagTable.h 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmVS10LinkFlagTable.h 2014-05-13 17:15:35.000000000 +0200 @@ -191,10 +191,7 @@ {"LinkDLL", "DLL", "", "true", 0}, //Bool Properties With Argument - {"EnableUAC", "MANIFESTUAC:NO", "", "false", - cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, - {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "", - cmVS7FlagTable::UserValueRequired}, + {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0}, {"EnableUAC", "MANIFESTUAC:", "", "true", cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmVS11LinkFlagTable.h new/cmake-3.0.0-rc5/Source/cmVS11LinkFlagTable.h --- old/cmake-3.0.0-rc4/Source/cmVS11LinkFlagTable.h 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmVS11LinkFlagTable.h 2014-05-13 17:15:35.000000000 +0200 @@ -217,10 +217,7 @@ {"LinkDLL", "DLL", "", "true", 0}, //Bool Properties With Argument - {"EnableUAC", "MANIFESTUAC:NO", "", "false", - cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, - {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "", - cmVS7FlagTable::UserValueRequired}, + {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0}, {"EnableUAC", "MANIFESTUAC:", "", "true", cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/cmVS12LinkFlagTable.h new/cmake-3.0.0-rc5/Source/cmVS12LinkFlagTable.h --- old/cmake-3.0.0-rc4/Source/cmVS12LinkFlagTable.h 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/cmVS12LinkFlagTable.h 2014-05-13 17:15:35.000000000 +0200 @@ -217,10 +217,7 @@ {"LinkDLL", "DLL", "", "true", 0}, //Bool Properties With Argument - {"EnableUAC", "MANIFESTUAC:NO", "", "false", - cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, - {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "", - cmVS7FlagTable::UserValueRequired}, + {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0}, {"EnableUAC", "MANIFESTUAC:", "", "true", cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Source/kwsys/SystemInformation.cxx new/cmake-3.0.0-rc5/Source/kwsys/SystemInformation.cxx --- old/cmake-3.0.0-rc4/Source/kwsys/SystemInformation.cxx 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Source/kwsys/SystemInformation.cxx 2014-05-13 17:15:35.000000000 +0200 @@ -88,15 +88,6 @@ # include <ifaddrs.h> # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -# include <execinfo.h> -# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -# include <cxxabi.h> -# endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -# include <dlfcn.h> -# endif -# endif #endif #if defined(__OpenBSD__) || defined(__NetBSD__) @@ -126,16 +117,8 @@ # include <ifaddrs.h> # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif -# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050 -# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -# include <execinfo.h> -# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -# include <cxxabi.h> -# endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -# include <dlfcn.h> -# endif -# endif +# if !(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050) +# undef KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE # endif #endif @@ -150,15 +133,6 @@ # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif # endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -# include <execinfo.h> -# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -# include <cxxabi.h> -# endif -# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -# include <dlfcn.h> -# endif -# endif # if defined(KWSYS_CXX_HAS_RLIMIT64) typedef struct rlimit64 ResourceLimitType; # define GetResourceLimit getrlimit64 @@ -178,6 +152,19 @@ # include <OS.h> #endif +#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) +# include <execinfo.h> +# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) +# include <cxxabi.h> +# endif +# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) +# include <dlfcn.h> +# endif +#else +# undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE +# undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP +#endif + #include <memory.h> #include <stdlib.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/CMakeLists.txt new/cmake-3.0.0-rc5/Tests/CMakeLists.txt --- old/cmake-3.0.0-rc4/Tests/CMakeLists.txt 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Tests/CMakeLists.txt 2014-05-13 17:15:35.000000000 +0200 @@ -2245,6 +2245,18 @@ PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}") configure_file( + "${CMake_SOURCE_DIR}/Tests/CTestTestBadGenerator/test.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestTestBadGenerator/test.cmake" + @ONLY ESCAPE_QUOTES) + add_test(CTestTestBadGenerator ${CMAKE_CTEST_COMMAND} + -C "\${CTestTest_CONFIG}" + -S "${CMake_BINARY_DIR}/Tests/CTestTestBadGenerator/test.cmake" -V + --output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadGenerator/testOutput.log" + ) + set_property(TEST CTestTestBadGenerator PROPERTY + PASS_REGULAR_EXPRESSION "could not create generator named \"Bad Generator\"") + + configure_file( "${CMake_SOURCE_DIR}/Tests/CTestTestParallel/test.cmake.in" "${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake" @ONLY ESCAPE_QUOTES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/CTestTestBadGenerator/CMakeLists.txt new/cmake-3.0.0-rc5/Tests/CTestTestBadGenerator/CMakeLists.txt --- old/cmake-3.0.0-rc4/Tests/CTestTestBadGenerator/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc5/Tests/CTestTestBadGenerator/CMakeLists.txt 2014-05-13 17:15:35.000000000 +0200 @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 3.0) +project(CTestTestDepends NONE) +include(CTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/CTestTestBadGenerator/CTestConfig.cmake new/cmake-3.0.0-rc5/Tests/CTestTestBadGenerator/CTestConfig.cmake --- old/cmake-3.0.0-rc4/Tests/CTestTestBadGenerator/CTestConfig.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc5/Tests/CTestTestBadGenerator/CTestConfig.cmake 2014-05-13 17:15:35.000000000 +0200 @@ -0,0 +1,7 @@ +set (CTEST_PROJECT_NAME "CTestTestBadGenerator") +set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT") +set (CTEST_DART_SERVER_VERSION "2") +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "www.cdash.org") +set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PublicDashboard") +set(CTEST_DROP_SITE_CDASH TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/CTestTestBadGenerator/test.cmake.in new/cmake-3.0.0-rc5/Tests/CTestTestBadGenerator/test.cmake.in --- old/cmake-3.0.0-rc4/Tests/CTestTestBadGenerator/test.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc5/Tests/CTestTestBadGenerator/test.cmake.in 2014-05-13 17:15:35.000000000 +0200 @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.0) + +# Settings: +set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest") +set(CTEST_SITE "@SITE@") +set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Depends") + +set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestBadGenerator") +set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestBadGenerator") +set(CTEST_CVS_COMMAND "@CVSCOMMAND@") +set(CTEST_CMAKE_GENERATOR "Bad Generator") +set(CTEST_CMAKE_GENERATOR_TOOLSET "") +set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") +set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@") +set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") + +CTEST_START(Experimental) +CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) +CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) +CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-WARN-Dir/CMakeLists.txt new/cmake-3.0.0-rc5/Tests/RunCMake/CMP0026/CMP0026-WARN-Dir/CMakeLists.txt --- old/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-WARN-Dir/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-3.0.0-rc5/Tests/RunCMake/CMP0026/CMP0026-WARN-Dir/CMakeLists.txt 2014-05-13 17:15:36.000000000 +0200 @@ -0,0 +1 @@ +add_library(otherlib ../empty.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-WARN-stderr.txt new/cmake-3.0.0-rc5/Tests/RunCMake/CMP0026/CMP0026-WARN-stderr.txt --- old/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-WARN-stderr.txt 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Tests/RunCMake/CMP0026/CMP0026-WARN-stderr.txt 2014-05-13 17:15:36.000000000 +0200 @@ -10,3 +10,16 @@ Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) This warning is for project developers. Use -Wno-dev to suppress it. ++ +CMake Warning \(dev\) at CMP0026-WARN.cmake:8 \(get_target_property\): + Policy CMP0026 is not set: Disallow use of the LOCATION target property. + Run "cmake --help-policy CMP0026" for policy details. Use the cmake_policy + command to set the policy and suppress this warning. + + The LOCATION property should not be read from target "otherlib". Use the + target name directly with add_custom_command, or use the generator + expression \$<TARGET_FILE>, as appropriate. + +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-WARN.cmake new/cmake-3.0.0-rc5/Tests/RunCMake/CMP0026/CMP0026-WARN.cmake --- old/cmake-3.0.0-rc4/Tests/RunCMake/CMP0026/CMP0026-WARN.cmake 2014-04-16 19:54:41.000000000 +0200 +++ new/cmake-3.0.0-rc5/Tests/RunCMake/CMP0026/CMP0026-WARN.cmake 2014-05-13 17:15:36.000000000 +0200 @@ -3,3 +3,6 @@ add_library(somelib empty.cpp) get_target_property(_loc somelib LOCATION) + +add_subdirectory(CMP0026-WARN-Dir) +get_target_property(_loc otherlib LOCATION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Utilities/Sphinx/CMakeLists.txt new/cmake-3.0.0-rc5/Utilities/Sphinx/CMakeLists.txt --- old/cmake-3.0.0-rc4/Utilities/Sphinx/CMakeLists.txt 2014-04-16 19:54:42.000000000 +0200 +++ new/cmake-3.0.0-rc5/Utilities/Sphinx/CMakeLists.txt 2014-05-13 17:15:37.000000000 +0200 @@ -24,6 +24,7 @@ option(SPHINX_MAN "Build man pages with Sphinx" OFF) option(SPHINX_HTML "Build html help with Sphinx" OFF) +option(SPHINX_SINGLEHTML "Build html single page help with Sphinx" OFF) option(SPHINX_TEXT "Build text help with Sphinx (not installed)" OFF) find_program(SPHINX_EXECUTABLE NAMES sphinx-build @@ -32,7 +33,7 @@ mark_as_advanced(SPHINX_TEXT) -if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_TEXT) +if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_TEXT) return() elseif(NOT SPHINX_EXECUTABLE) message(FATAL_ERROR "SPHINX_EXECUTABLE (sphinx-build) is not found!") @@ -60,6 +61,9 @@ if(SPHINX_MAN) list(APPEND doc_formats man) endif() +if(SPHINX_SINGLEHTML) + list(APPEND doc_formats singlehtml) +endif() if(SPHINX_TEXT) list(APPEND doc_formats text) endif() @@ -120,5 +124,13 @@ DESTINATION ${CMAKE_DOC_DIR} PATTERN .buildinfo EXCLUDE PATTERN objects.inv EXCLUDE + ) +endif() + +if(SPHINX_SINGLEHTML) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/singlehtml + DESTINATION ${CMAKE_DOC_DIR} + PATTERN .buildinfo EXCLUDE + PATTERN objects.inv EXCLUDE ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Utilities/Sphinx/cmake.py new/cmake-3.0.0-rc5/Utilities/Sphinx/cmake.py --- old/cmake-3.0.0-rc4/Utilities/Sphinx/cmake.py 2014-04-16 19:54:42.000000000 +0200 +++ new/cmake-3.0.0-rc5/Utilities/Sphinx/cmake.py 2014-05-13 17:15:37.000000000 +0200 @@ -62,12 +62,12 @@ settings.record_dependencies.add(path) f = io.FileInput(source_path=path, encoding=encoding, error_handler=e_handler) - except UnicodeEncodeError, error: + except UnicodeEncodeError as error: raise self.severe('Problems with "%s" directive path:\n' 'Cannot encode input file path "%s" ' '(wrong locale?).' % (self.name, SafeString(path))) - except IOError, error: + except IOError as error: raise self.severe('Problems with "%s" directive path:\n%s.' % (self.name, ErrorString(error))) raw_lines = f.read().splitlines() @@ -290,9 +290,12 @@ } def clear_doc(self, docname): + to_clear = set() for fullname, (fn, _) in self.data['objects'].items(): if fn == docname: - del self.data['objects'][fullname] + to_clear.add(fullname) + for fullname in to_clear: + del self.data['objects'][fullname] def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode): @@ -305,7 +308,7 @@ contnode, target) def get_objects(self): - for refname, (docname, type) in self.data['objects'].iteritems(): + for refname, (docname, type) in self.data['objects'].items(): yield (refname, refname, type, docname, refname, 1) def setup(app): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/Utilities/Sphinx/conf.py.in new/cmake-3.0.0-rc5/Utilities/Sphinx/conf.py.in --- old/cmake-3.0.0-rc4/Utilities/Sphinx/conf.py.in 2014-04-16 19:54:42.000000000 +0200 +++ new/cmake-3.0.0-rc5/Utilities/Sphinx/conf.py.in 2014-05-13 17:15:37.000000000 +0200 @@ -50,7 +50,7 @@ name, desc, [], int(sec))) else: sys.stderr.write("ERROR: No cmake-manual-description in '%s'\n" % fpath) - except Exception, e: + except Exception as e: sys.stderr.write("ERROR: %s\n" % str(e)) man_show_urls = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-3.0.0-rc4/bootstrap new/cmake-3.0.0-rc5/bootstrap --- old/cmake-3.0.0-rc4/bootstrap 2014-04-16 19:54:42.000000000 +0200 +++ new/cmake-3.0.0-rc5/bootstrap 2014-05-13 17:15:37.000000000 +0200 @@ -1085,8 +1085,8 @@ cmake_test_flags= # If we are on HP-UX, check for -Ae for the C compiler. - cmake_test_flags="-Ae" if [ "x${cmake_system}" = "xHP-UX" ]; then + cmake_test_flags="-Ae" TMPFILE=`cmake_tmp_file` echo ' int main(int argc, char** argv) { (void)argc; (void)argv; return 0; } @@ -1107,6 +1107,29 @@ echo "${cmake_c_compiler} does not need ${cmake_test_flags}" fi rm -f "${TMPFILE}.c" + echo ' + #include <iostream> + int main(int argc, char** argv) { + for(int i=0; i < 1; ++i); + for(int i=0; i < 1; ++i); + (void)argc; (void)argv; return 0; } +' > ${TMPFILE}.cxx + cmake_need_AAstd98=0 + cmake_test_flags="-AA +hpxstd98" + if cmake_try_run "${cmake_cxx_compiler}" "${cmake_cxx_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then + : + else + if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then + cmake_need_AAstd98=1 + fi + fi + if [ "x${cmake_need_AAstd98}" = "x1" ]; then + cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}" + echo "${cmake_cxx_compiler} needs ${cmake_test_flags}" + else + echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}" + fi fi cmake_test_flags= fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
