Request 550 (accepted)
No description set
Submit package home:cxl000:branches:home:cxl000:mc / cmake to package home:cxl000:mc / cmake
| [-] [+] | Added | cmake-gui.changes |
| [-] [+] | Added | cmake.changes ^ |
| [-] [+] | Changed | cmake-gui.spec ^ |
| [-] [+] | Changed | cmake.spec ^ |
| [-] [+] | Added | README.packager ^ |
| @@ -0,0 +1,11 @@ +CMake on MeeGo +-------------- + +CMaker is splitted in 2 sub-projects (cmake and cmake-gui) +to avoid to be blocked by Qt build. + +The following workflow should be used to update cmake: + 1. update cmake.spec + 2. update cmake.changes + 3. run pre_checking.sh script (sync cmake-gui.spec and cmake-gui.changes) + | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/ChangeLog.manual ^ |
| @@ -1,3 +1,20 @@ +Changes in CMake 2.8.12.2 (since 2.8.12.1) +------------------------------------------ +Brad King (4): + VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577) + Replace <OBJECT_DIR> rule placeholder consistently (#14667) + VS: Convert include path to backslashes for VS >= 10 + Revert "Ninja: Track configured files so we can regenerate them." + +Rolf Eike Beer (1): + FindOpenMP: fix detecting compilers that do not need any special flag (#14567) + +Ruslan Baratov (1): + Xcode: Fix storyboard view + +Ted Kremenek (1): + CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1 + Changes in CMake 2.8.12.1 (since 2.8.12) ---------------------------------------- Brad King (9): | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Modules/CMakeDetermineCompilerId.cmake ^ |
| @@ -209,7 +209,7 @@ # ... # /path/to/cc ...CompilerId${lang}/... # to extract the compiler front-end for the language. - if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/\\./CompilerId${lang}[ \t\n\\\"]") + if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/(\\./)?CompilerId${lang}[ \t\n\\\"]") set(_comp "${CMAKE_MATCH_2}") if(EXISTS "${_comp}") set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE) | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Modules/FindOpenMP.cmake ^ |
| @@ -31,6 +31,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG) set(OpenMP_FLAG_CANDIDATES + #Empty, if compiler automatically accepts openmp + " " #GNU "-fopenmp" #Microsoft Visual Studio @@ -39,8 +41,6 @@ "-Qopenmp" #PathScale, Intel "-openmp" - #Empty, if compiler automatically accepts openmp - " " #Sun "-xopenmp" #HP @@ -64,6 +64,7 @@ set(OMP_FLAG_PGI "-mp") set(OMP_FLAG_SunPro "-xopenmp") set(OMP_FLAG_XL "-qsmp") + set(OMP_FLAG_Cray " ") # Move the flag that matches the compiler to the head of the list, # this is faster and doesn't clutter the output that much. If that @@ -100,7 +101,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake) endif() - foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES}) + foreach(FLAG IN LISTS OpenMP_C_FLAG_CANDIDATES) set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") set(CMAKE_REQUIRED_FLAGS "${FLAG}") unset(OpenMP_FLAG_DETECTED CACHE) @@ -134,7 +135,7 @@ set(OpenMP_CXX_TEST_SOURCE ${OpenMP_C_TEST_SOURCE}) endif() - foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES}) + foreach(FLAG IN LISTS OpenMP_CXX_FLAG_CANDIDATES) set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") set(CMAKE_REQUIRED_FLAGS "${FLAG}") unset(OpenMP_FLAG_DETECTED CACHE) | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/CMakeVersion.cmake ^ |
| @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) -set(CMake_VERSION_TWEAK 1) +set(CMake_VERSION_TWEAK 2) #set(CMake_VERSION_RC 0) | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmGlobalNinjaGenerator.cxx ^ |
| @@ -1094,9 +1094,6 @@ this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i) { const std::vector<std::string>& lf = (*i)->GetMakefile()->GetListFiles(); implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end()); - - const std::vector<std::string>& of = (*i)->GetMakefile()->GetOutputFiles(); - implicitDeps.insert(implicitDeps.end(), of.begin(), of.end()); } std::sort(implicitDeps.begin(), implicitDeps.end()); implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()), | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmGlobalXCodeGenerator.cxx ^ |
| @@ -877,8 +877,10 @@ } std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang); - - fileRef->AddAttribute("explicitFileType", + const char* attribute = (sourcecode == "file.storyboard") ? + "lastKnownFileType" : + "explicitFileType"; + fileRef->AddAttribute(attribute, this->CreateString(sourcecode.c_str())); // Store the file path relative to the top of the source tree. | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmLocalVisualStudio7Generator.cxx ^ |
| @@ -477,6 +477,8 @@ {"AssemblerListingLocation", "Fa", "ASM List Location", "", cmVS7FlagTable::UserValue}, + {"ProgramDataBaseFileName", "Fd", "Program Database File Name", "", + cmVS7FlagTable::UserValue}, // boolean flags {"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0}, | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmMakefileExecutableTargetGenerator.cxx ^ |
| @@ -338,13 +338,11 @@ vars.CMTarget = this->Target; vars.Language = linkLanguage; vars.Objects = buildObjs.c_str(); - std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); - objdir += this->Target->GetName(); - objdir += ".dir"; - objdir = this->Convert(objdir.c_str(), - cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::SHELL); - vars.ObjectDir = objdir.c_str(); + std::string objectDir = this->Target->GetSupportDirectory(); + objectDir = this->Convert(objectDir.c_str(), + cmLocalGenerator::START_OUTPUT, + cmLocalGenerator::SHELL); + vars.ObjectDir = objectDir.c_str(); vars.Target = targetOutPathReal.c_str(); vars.TargetPDB = targetOutPathPDB.c_str(); | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmMakefileLibraryTargetGenerator.cxx ^ |
| @@ -577,13 +577,11 @@ vars.CMTarget = this->Target; vars.Language = linkLanguage; vars.Objects = buildObjs.c_str(); - std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); - objdir += this->Target->GetName(); - objdir += ".dir"; - objdir = this->Convert(objdir.c_str(), - cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::SHELL); - vars.ObjectDir = objdir.c_str(); + std::string objectDir = this->Target->GetSupportDirectory(); + objectDir = this->Convert(objectDir.c_str(), + cmLocalGenerator::START_OUTPUT, + cmLocalGenerator::SHELL); + vars.ObjectDir = objectDir.c_str(); vars.Target = targetOutPathReal.c_str(); vars.LinkLibraries = linkLibs.c_str(); vars.ObjectsQuoted = buildObjs.c_str(); | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmMakefileTargetGenerator.cxx ^ |
| @@ -638,7 +638,7 @@ cmLocalGenerator::NONE, cmLocalGenerator::SHELL).c_str(); vars.Object = shellObj.c_str(); - std::string objectDir = cmSystemTools::GetFilenamePath(obj); + std::string objectDir = this->Target->GetSupportDirectory(); objectDir = this->Convert(objectDir.c_str(), cmLocalGenerator::START_OUTPUT, cmLocalGenerator::SHELL); | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmNinjaTargetGenerator.cxx ^ |
| @@ -543,7 +543,7 @@ vars["DEP_FILE"] = objectFileName + ".d";; EnsureParentDirectoryExists(objectFileName); - std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName); + std::string objectDir = this->Target->GetSupportDirectory(); vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat( ConvertToNinjaPath(objectDir.c_str()).c_str(), cmLocalGenerator::SHELL); | ||
| [-] [+] | Changed | cmake-2.8.12.2.tar.gz/Source/cmVisualStudio10TargetGenerator.cxx ^ |
| @@ -1420,7 +1420,9 @@ for(std::vector<std::string>::const_iterator i = includes.begin(); i != includes.end(); ++i) { - *this->BuildFileStream << cmVS10EscapeXML(*i) << ";"; + std::string incDir = *i; + this->ConvertToWindowsSlash(incDir); + *this->BuildFileStream << cmVS10EscapeXML(incDir) << ";"; } this->WriteString("%(AdditionalIncludeDirectories)" "</AdditionalIncludeDirectories>\n", 0); | ||
| [-] [+] | Added | pre_checkin.sh ^ |
| @@ -0,0 +1,5 @@ +#!/bin/sh + +sed -e 's,build_with_qt 0,build_with_qt 1,' cmake.spec > cmake-gui.spec +cp cmake.changes cmake-gui.changes + | ||
