summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release'Brad King2014-03-130-0/+0
|\
| * Merge branch 'fix-CMP0046-warning' into releaseBrad King2014-03-126-4/+31
| |\
* | \ Merge topic 'generalize-cmCustomCommandGenerator'Brad King2014-03-1322-180/+217
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bc993f27 Generalize cmCustomCommandGenerator to more fields 9a5c5544 cmGlobalXCodeGenerator: Simplify handling of multiple outputs d45e7f34 cmCustomCommand: Return std::string from GetWorkingDirectory
| * | | Generalize cmCustomCommandGenerator to more fieldsBrad King2014-03-1219-123/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now the cmCustomCommandGenerator was used only to compute the command lines of a custom command. Generalize it to get the comment, working directory, dependencies, and outputs of custom commands. Update use in all generators to support this.
| * | | cmGlobalXCodeGenerator: Simplify handling of multiple outputsBrad King2014-03-122-34/+19
| | | | | | | | | | | | | | | | | | | | Make the multiple output pair map more local. Generate it where we have the current configuration available.
| * | | cmCustomCommand: Return std::string from GetWorkingDirectoryBrad King2014-03-127-29/+22
| | | |
* | | | Merge topic 'string-apis-fix-cmake-gui'Brad King2014-03-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ae32622b cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)
| * | | | cmake-gui: Fix handling of missing CMAKE_EXTRA_GENERATOR (#14804)Brad King2014-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1a1b737c (stringapi: Use strings for generator names, 2014-02-24) cmExternalMakefileProjectGenerator::CreateFullGeneratorName expects a std::string instead of const char*. When no extra generator name is available, pass an empty string to avoid NULL dereference.
* | | | | Merge topic 'fix-CMP0046-warning'Brad King2014-03-136-4/+31
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | d83245a3 cmTarget: Don't create duplicate backtraces in CMP0046 warning
| * | | | cmTarget: Don't create duplicate backtraces in CMP0046 warningStephen Kelly2014-03-126-4/+31
| | |_|/ | |/| |
* | | | CMake Nightly Date StampKitware Robot2014-03-131-1/+1
| | | |
* | | | Merge topic 'update-kwsys'Brad King2014-03-120-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | dcc49d9c Merge branch 'upstream-kwsys' into update-kwsys c1dde67e KWSys 2014-03-12 (dd873734)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-03-120-0/+0
| |\ \ \ |/ / / /
| * | | KWSys 2014-03-12 (dd873734)KWSys Robot2014-03-122-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ dd873734 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 9c653603..dd873734 Brad King (1): 88c5a768 Set policy CMP0025 to NEW within KWSys Stephen Kelly (1): dd873734 SystemTools: Remove some unnecessary c_str() calls Change-Id: I5487fefcb3e44875ed5748fb2c4ab8302fcef984
* | | | Merge topic 'remove-c_str-calls'Brad King2014-03-12169-1679/+1679
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3be265b3 Workaround Sun C++ 5.9 compiler crash af8a1643 Remove c_str calls when using stream APIs. 21c573f6 Remove some c_str() calls.
| * | | | Workaround Sun C++ 5.9 compiler crashBrad King2014-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Adjust whitespace in Source/CPack/cpack.cxx to avoid a strange internal compiler crash.
| * | | | Remove c_str calls when using stream APIs.Stephen Kelly2014-03-1149-297/+297
| | | | | | | | | | | | | | | | | | | | | | | | | Use an ad-hoc clang tool for matching the calls which should be ported.
| * | | | Remove some c_str() calls.Stephen Kelly2014-03-11157-1384/+1384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the clang RemoveCStrCalls tool to automatically migrate the code. This was only run on linux, so does not have any positive or negative effect on other platforms.
* | | | | Merge branch 'release'Brad King2014-03-120-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'fix-find_dependency-EXACT' into releaseBrad King2014-03-121-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-xcode-compiler-force' into releaseBrad King2014-03-115-92/+37
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'unicode-cmake-gui'Brad King2014-03-122-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 649789a7 Unicode: cmake-gui encoding now matches KWSys encoding.
| * | | | | | | Unicode: cmake-gui encoding now matches KWSys encoding.Clinton Stimpson2014-03-112-0/+13
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A UTF-8 QTextCodec is used with QString when KWSys is configured to treat strings as UTF-8. This means QString::toLocal8Bit() will convert to UTF-8.
* | | | | | | Merge topic 'FindPkgConfig-revise-docs'Brad King2014-03-121-135/+118
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49ef91d7 FindPkgConfig: restructure documentation and document commands and variables
| * | | | | | | FindPkgConfig: restructure documentation and document commands and variablesDaniele E. Domenichelli2014-03-101-135/+118
| | | | | | | |
* | | | | | | | Merge topic 'fix-find_dependency-EXACT-for-master'Brad King2014-03-1214-0/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f74a8405 Test error cases in find_dependency.
| * | | | | | | | Test error cases in find_dependency.Stephen Kelly2014-03-1114-0/+54
| | | | | | | | |
* | | | | | | | | Merge topic 'fix-find_dependency-EXACT'Brad King2014-03-121-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 224f50f4 find_dependency: Make sure invalid EXACT use can be reported.
| * | | | | | | | find_dependency: Make sure invalid EXACT use can be reported.Stephen Kelly2014-03-111-3/+3
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test the first argument directly for matching 'EXACT'. The error check in its previous position was incorrect and would only trigger with a version of '0' or similar.
* | | | | | | | Merge topic 'fix-xcode-compiler-force'Brad King2014-03-125-92/+37
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | 8c9bfac3 Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible 6852fb80 CMakeDetermine*Compiler: Factor out search for compiler in PATH
| * | | | | | Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possibleBrad King2014-03-103-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During cross-compiling the toolchain file may use CMakeForceCompiler to force a compiler setting. When using the Xcode generator try to convert it to a full path by searching the PATH as is done for the Makefile generators.
| * | | | | | CMakeDetermine*Compiler: Factor out search for compiler in PATHBrad King2014-03-105-92/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out a _cmake_find_compiler_path helper macro to avoid duplication of the search for a full path to the compiler.
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-121-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'ctest-coverage-extra'Brad King2014-03-112-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93d5c4dc Help: Add release notes for topic 'ctest-coverage-extra' ef1c1153 CTest: Teach ctest_coverage() to read CTEST_COVERAGE_EXTRA_FLAGS
| * | | | | | Help: Add release notes for topic 'ctest-coverage-extra'Brad King2014-03-101-0/+5
| | | | | | |
| * | | | | | CTest: Teach ctest_coverage() to read CTEST_COVERAGE_EXTRA_FLAGSVolkan Gezer2014-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use it to set the CoverageExtraFlags value just as COVERAGE_EXTRA_FLAGS does in the CTest module for creating DartConfiguration.tcl.
* | | | | | | Merge branch 'release'Brad King2014-03-110-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'doc-osx-path-variables' into releaseBrad King2014-03-103-0/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-AUTOGEN-custom-command-depends' into releaseBrad King2014-03-104-3/+36
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-find_dependency-EXACT' into releaseBrad King2014-03-101-2/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fix-Qt4-DBus-macro' into releaseBrad King2014-03-101-1/+1
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'cmcurl-include-first'Brad King2014-03-111-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8c027bc cmcurl: Include the local curl directories before all others.
| * | | | | | | | | | | cmcurl: Include the local curl directories before all others.Raphael Kubo da Costa2014-03-101-2/+5
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, it was possible for the include directory of the system-wide libcurl to be added to the include path before cmcurl's, which would result in them being picked up and causing the build to fail if the curl versions differ too much. One way to trigger this is to have OpenSSL installed into a non-default location together with libcurl (/usr/local, for example). If cmcurl is built with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added before -I${PATH_TO_CMCURL}.
* | | | | | | | | | | Merge topic 'watcom-VERBOSE-and-ERROR'Brad King2014-03-113-21/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1b689b6 Makefile: Improve handling of WMake verbose output and errors
| * | | | | | | | | | | Makefile: Improve handling of WMake verbose output and errorsJiri Malak2014-03-103-21/+26
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The '-e' option has nothing to do with verbose output. It is now properly handled by .ERASE directive in make file * The '-s' option sets silent output globally, it cannot be switched off. It is now handled only by .SILENT directive in make file directive is simply controlled by a conditonal block. Remove SilentNoColon member variable as it is no longer needed.
* | | | | | | | | | | Merge topic 'cmELF-typo'Brad King2014-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 172d8d94 cmELF: Fix typo in comment, 32-bit => 64-bit (#14799)
| * | | | | | | | | | | cmELF: Fix typo in comment, 32-bit => 64-bit (#14799)Ryo ONODERA2014-03-101-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'ninja-command-line-length-haiku'Brad King2014-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c90f0a6 Ninja: Detect command-line length limit on Haiku
| * | | | | | | | | | | Ninja: Detect command-line length limit on HaikuAdrien Destugues2014-03-101-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'FindFreetype-path-suffix-without-include'Brad King2014-03-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b79a1f67 FindFreetype: Add plain 'freetype2' path suffix
generated by cgit v0.12 at 2025-01-10 13:15:57 (GMT)