summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CTestUpdateGit-safecrlf'David Cole2012-06-211-0/+3
|\ | | | | | | | | 5c153c6 Make CTest.UpdateGIT robust to Git safecrlf on Windows
| * Make CTest.UpdateGIT robust to Git safecrlf on WindowsBrad King2012-06-201-0/+3
| | | | | | | | | | | | | | If the user has configured 'core.autocrlf' and 'core.safecrlf' then 'git submodule add' will fail to 'git add' the '.gitmodules' file because it has LF newlines, at least as of Git 1.7.11. Disable 'core.safecrlf' in our test repository to avoid the problem.
* | Merge topic 'no-source-language-crash'David Cole2012-06-211-4/+7
|\ \ | | | | | | | | | | | | 2c2fbaf Do not crash on unknown source language (#13323)
| * | Do not crash on unknown source language (#13323)Mariusz Plucinski2012-06-201-4/+7
| | | | | | | | | | | | | | | | | | If a source file extension is not recognized as any language then src.GetLanguage() may return NULL. Check the result before dereferencing in cmLocalGenerator::GetObjectFileNameWithoutTarget.
* | | Merge topic 'find-devil-doc-formatting'David Cole2012-06-211-5/+16
|\ \ \ | | | | | | | | | | | | | | | | af988e8 FindDevIL: clean up documentation formatting
| * | | FindDevIL: clean up documentation formattingRolf Eike Beer2012-06-191-5/+16
| | | |
* | | | Merge topic 'use-string-to-cmake-path'David Cole2012-06-213-18/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3505e68 replace open coded versions of file(TO_CMAKE_PATH)
| * | | | replace open coded versions of file(TO_CMAKE_PATH)Rolf Eike Beer2012-06-193-18/+6
| |/ / /
* | | | Merge topic 'no-explicit-usr-search'David Cole2012-06-2114-72/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e93ac6f do not explicitely specify /usr and /usr/local as search paths
| * | | | do not explicitely specify /usr and /usr/local as search pathsRolf Eike Beer2012-06-1914-72/+0
| |/ / / | | | | | | | | | | | | If not explicitely excluded these paths are searched automatically anyway.
* | | | Merge topic 'fix-typos'David Cole2012-06-213-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 188b96b fix some typos
| * | | | fix some typosRolf Eike Beer2012-06-193-3/+3
| |/ / /
* | | | Merge topic 'run_compile_commands-aix-gcc-2.9'David Cole2012-06-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 96b66a4 Avoid string.clear and string.push_back (#13319)
| * | | | Avoid string.clear and string.push_back (#13319)Daniel R. Gomez2012-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | Compiler "gcc version 2.9-aix51-020209" does not offer them.
* | | | | Merge topic 'test-FindPackageModeMakefileTest'David Cole2012-06-211-3/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 09ff191 Fix FindPackageMode test Makefile (#13314)
| * | | | | Fix FindPackageMode test Makefile (#13314)Daniel R. Gomez2012-06-191-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CXXFLAGS in the makefile's link rule since it invokes the C++ compiler front-end. Retool the makefile not to require GNU Make. Using backticks instead of $(shell ...) is safe so long as one guards against the possibility of backslashes getting inside the backticks, so use temporary files and shell variables to avoid them.
* | | | | | Merge topic 'test-Assembler-C-flags'David Cole2012-06-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d686517 Tests/Assembler: Assemble and link with same flags (#13314)
| * | | | | | Tests/Assembler: Assemble and link with same flags (#13314)Daniel R. Gomez2012-06-181-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The test uses the C compiler as the assembler so use the C flags for ASM too. This is important when the flags specify the target ABI.
* | | | | | CMake Nightly Date StampKitware Robot2012-06-211-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2012-06-201-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'test-VSGNUFortran-C-comment'David Cole2012-06-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 307d45e Tests/VSGNUFortran: Avoid C++ comment in C code (#13314)
| * | | | Tests/VSGNUFortran: Avoid C++ comment in C code (#13314)Daniel R. Gomez2012-06-181-1/+1
| |/ / /
* | | | Merge topic 'test-IncludeDirectories-eof'David Cole2012-06-191-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cad6921 Tests/IncludeDirectories: Files must end in a newline (#13314)
| * | | | Tests/IncludeDirectories: Files must end in a newline (#13314)Daniel R. Gomez2012-06-181-3/+1
| |/ / / | | | | | | | | | | | | The HP compiler really really wants source files to end with a newline.
* | | | Merge topic 'CPackDeb-docUpdate'David Cole2012-06-191-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5ac6ca0 CPackDeb add missing documentation for some CPACK_DEBIAN_xx variables.
| * | | | CPackDeb add missing documentation for some CPACK_DEBIAN_xx variables.Eric NOULARD2012-06-191-1/+29
| | |/ / | |/| | | | | | | | | | Inspired-By: Doug Linden <linderd@iinet.net.au>
* | | | Merge topic 'doc-set-command'David Cole2012-06-191-13/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f2c1f24 Improve documentation of set command (#13269)
| * | | | Improve documentation of set command (#13269)Sebastian Leske2012-06-181-13/+75
| | |/ / | |/| |
* | | | Merge topic 'FindBullet-LinearMath_Debug'David Cole2012-06-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4393b3b FindBullet: Add missing math library name (#13309)
| * | | | FindBullet: Add missing math library name (#13309)Jonathan Klein2012-06-181-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Add "LinearMath_Debug" to the list of names to search for BULLET_MATH_LIBRARY_DEBUG. The _Debug name is present in all other lines already. Now the script manages to find all debug&release libraries on my system.
* | | | Merge topic 'ninja-cldeps'David Cole2012-06-1919-75/+961
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb410e8 Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build 5ead31d Ninja: try work around for bcc32 bug 1333b57 Ninja: build server fixes 9081e3a remove warning about unused parameter f430bea Ninja: maybe this fixes the bcc32 build f2c1288 Ninja: msvc6 for-scoping 44b9bbc Ninja: build with old msvc versions 57156a5 Ninja: build server fixes f1abdce Ninja: some bytes of the rc files couldn't be piped correctly 2de963d Ninja: don't remove space between command and parameters 50b6f33 Ninja: build cmcldeps with mingw c05653e Ninja: try to make GetProcessId visible ab245ff Ninja: but cl supports /nologo ... bf58e9a Ninja: no /nologo option in old rc.exe 2fb07fc Ninja: Eclipse and KDevelop fixes for ninja 518c065 Ninja: don't pollute build dir with preprocessed rc files ...
| * | | | Ninja: disable cldeps for bcc32, it's too old, and ninja would also not buildPeter Kuemmel2012-06-182-7/+2
| | | | |
| * | | | Ninja: try work around for bcc32 bugPeter Kuemmel2012-06-171-1/+7
| | | | |
| * | | | Ninja: build server fixesPeter Kuemmel2012-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Why does the other compiler give no error? Seems there is somewhere a "using".
| * | | | remove warning about unused parameterPeter Kuemmel2012-06-161-1/+1
| | | | |
| * | | | Ninja: maybe this fixes the bcc32 buildPeter Kuemmel2012-06-161-0/+1
| | | | |
| * | | | Ninja: msvc6 for-scopingPeter Kuemmel2012-06-161-7/+7
| | | | |
| * | | | Ninja: build with old msvc versionsPeter Kuemmel2012-06-161-20/+31
| | | | |
| * | | | Ninja: build server fixesPeter Kuemmel2012-06-162-53/+52
| | | | | | | | | | | | | | | | | | | | | | | | | - disable cldeps on cygwin - don't "use" namespace std
| * | | | Ninja: some bytes of the rc files couldn't be piped correctlyPeter Kuemmel2012-06-151-9/+18
| | | | | | | | | | | | | | | | | | | | Write to a file again but generate it in the object dir
| * | | | Ninja: don't remove space between command and parametersPeter Kuemmel2012-06-151-1/+1
| | | | |
| * | | | Ninja: build cmcldeps with mingwPeter Kuemmel2012-06-152-1/+3
| | | | |
| * | | | Ninja: try to make GetProcessId visiblePeter Kuemmel2012-06-151-1/+2
| | | | |
| * | | | Ninja: but cl supports /nologo ...Peter Kuemmel2012-06-151-3/+4
| | | | |
| * | | | Ninja: no /nologo option in old rc.exePeter Kuemmel2012-06-151-3/+2
| | | | |
| * | | | Ninja: Eclipse and KDevelop fixes for ninjaPeter Kuemmel2012-06-155-4/+26
| | | | | | | | | | | | | | | | | | | | Thx to Claus Klein
| * | | | Ninja: don't pollute build dir with preprocessed rc filesPeter Kuemmel2012-06-151-1/+1
| | | | |
| * | | | Ninja: be more accurate when estimating the command line lengthPeter Kuemmel2012-06-152-4/+6
| | | | |
| * | | | Ninja: undo all the NOSHELL patchesPeter Kuemmel2012-06-146-85/+37
| | | | |
| * | | | Ninja: Restructure code to work with the Borland compilersDavid Cole2012-06-141-2/+8
| | | | | | | | | | | | | | | | | | | | Should fix the Borland dashboard errors.