summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-compiler-change'Brad King2014-09-242-1/+10
|\ | | | | | | | | 6120fca8 Ninja: Prevent compilers to be silently modified
| * Ninja: Prevent compilers to be silently modifiedSylvain Joubert2014-09-222-1/+10
| | | | | | | | | | | | | | Unlike with Unix Makefiles generator modifying compiler paths was not protected with Ninja generator. It was possible to modify them in the cache without the expected effect on the generated solution. Also activate corresponding tests with Ninja.
* | CMake Nightly Date StampKitware Robot2014-09-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-09-231-1/+1
| |
* | Merge topic 'wix-remember-install-dir'Brad King2014-09-221-0/+23
|\ \ | | | | | | | | | | | | e785fab5 CPackWiX: Teach WiX installers to remember the install location for upgrades
| * | CPackWiX: Teach WiX installers to remember the install location for upgradesNils Gladitz2014-09-191-0/+23
| |/
* | Merge topic 'vs-windows-store-certifictes'Brad King2014-09-221-0/+4
|\ \ | | | | | | | | | | | | d4ca8fb2 VS: Add Certificates to .vcxproj files
| * | VS: Add Certificates to .vcxproj filesGilles Khouzam2014-09-191-0/+4
| |/ | | | | | | | | | | After certificates were moved into their own category in cmGeneratorTarget, that category was not added for output by the VS 10 generator. Add it now.
* | Merge topic 'doc-toolchains'Brad King2014-09-221-11/+75
|\ \ | | | | | | | | | | | | | | | | | | 27022166 Help: Add Windows Phone/Store cross-compiling to cmake-toolchains.7 db54d872 Help: Add Windows CE cross-compiling to cmake-toolchains.7 manual 0d72451a Help: Add Cross Compiling subsections in cmake-toolchains.7 manual
| * | Help: Add Windows Phone/Store cross-compiling to cmake-toolchains.7Brad King2014-09-191-0/+22
| | | | | | | | | | | | Show simple example toolchain files for each.
| * | Help: Add Windows CE cross-compiling to cmake-toolchains.7 manualPascal Bach2014-09-191-0/+26
| | |
| * | Help: Add Cross Compiling subsections in cmake-toolchains.7 manualPascal Bach2014-09-191-14/+30
| |/ | | | | | | | | Organize the "Cross Compiling" section into subsections by platform. This will make it easier to add more subsections for more platforms.
* | Merge topic 'FindGettext-doc-update'Brad King2014-09-221-1/+1
|\ \ | | | | | | | | | | | | 3919f254 FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)
| * | FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)Brad King2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | Rename GETTEXT_PROCESS_POT to GETTEXT_PROCESS_POT_FILE. Patch-by: maahnat@gmail.com
* | | Merge topic 'fix-enable_language-missing-module-errors'Brad King2014-09-221-6/+6
|\ \ \ | | | | | | | | | | | | | | | | 1b549a5c enable_language: Fix error messages on missing modules (#15155)
| * | | enable_language: Fix error messages on missing modules (#15155)Brad King2014-09-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | In cmGlobalGenerator::EnableLanguage, fix error messages for missing module files to actually name the missing module instead of using the empty string returned by GetModulesFile.
* | | | Merge topic 'FindProtobuf-depend-protoc'Brad King2014-09-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e380d7c5 FindProtobuf: Make outputs depend on protoc executable
| * | | | FindProtobuf: Make outputs depend on protoc executableMichael Hanselmann2014-09-181-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After updating from Protocol Buffers 2.5.0 to 2.6.0 compilation of the generated source failed: "This file was generated by an older version of protoc which is incompatible with your Protocol Buffer headers. Please regenerate this file with a newer version of protoc.". Turns out the source and headers generated by way of FindProtobuf.cmake:PROTOBUF_GENERATE_CPP aren't updated. Adding a dependency on the compiler executable fixes this issue.
* | | | Merge topic 'FindOpenSceneGraph-pieces-not-found'Brad King2014-09-221-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b683da3e FindOpenSceneGraph: Do not add unfound OSG libs if not required
| * | | | FindOpenSceneGraph: Do not add unfound OSG libs if not requiredMattias Helsing2014-09-181-2/+5
| |/ / /
* | | | Merge topic 'autogen-fixes'Brad King2014-09-228-31/+176
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e3c97a19 QtAutogen: Process all ui files in a source file (#14981). b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.
| * | | | QtAutogen: Process all ui files in a source file (#14981).Stephen Kelly2014-09-187-30/+162
| | | | | | | | | | | | | | | | | | | | | | | | | Use a vector to store a list of matched ui_ includes, instead of overwriting the previous match.
| * | | | QtAutogen: Add source files to target when only AUTORCC is used.Stephen Kelly2014-09-173-1/+14
| | | | | | | | | | | | | | | | | | | | Add missing entry to if condition.
* | | | | Merge topic 'minor-cleanups'Brad King2014-09-222-9/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bda168 Simplify use of binary_search. 1927e4ba Remove const char string comparison helper.
| * | | | | Simplify use of binary_search.Stephen Kelly2014-09-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A local string was created when dir was a const char*. Now dir is a std::string already so the dirString is vestigal.
| * | | | | Remove const char string comparison helper.Stephen Kelly2014-09-171-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | It is now unused.
* | | | | | Merge topic 'clang-compile-options-cxx14'Brad King2014-09-221-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49b8140e Clang: Enable c++14 dialect flag with Clang 3.5. 0b80fc35 Clang: Don't overwrite c++11 compile option value with c++14 flag.
| * | | | | | Clang: Enable c++14 dialect flag with Clang 3.5.Stephen Kelly2014-09-171-1/+4
| | | | | | |
| * | | | | | Clang: Don't overwrite c++11 compile option value with c++14 flag.Stephen Kelly2014-09-171-2/+2
| |/ / / / /
* | | | | | Merge topic 'cleanup-CMP0054'Brad King2014-09-2210-13/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa7d47ac Tests: Fix CMP0054 warnings 3b5ea54a CheckPrototypeDefinition: Avoid if() auto-dereference c9b301cd ExternalProject: Fix CMP0054 warning in _ep_parse_arguments
| * | | | | | Tests: Fix CMP0054 warningsBrad King2014-09-168-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hack the CMP0054 warning locally to be an error and run the test suite. Resolve CMP0054 in Tests/* code as appropriate for each case.
| * | | | | | CheckPrototypeDefinition: Avoid if() auto-dereferenceBrad King2014-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert from the old if(MATCHES) hack to if(DEFINED) to check whether the result variable is already set.
| * | | | | | ExternalProject: Fix CMP0054 warning in _ep_parse_argumentsMatt McCormick2014-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the CMP0054 warning: CMake Warning (dev) at .../Modules/ExternalProject.cmake:242 (if): Policy CMP0054 is not set: Only interpret if() arguments as variables or keywords when unquoted. Run "cmake --help-policy CMP0054" for policy details. Use the cmake_policy command to set the policy and suppress this warning. Quoted keywords like "COMMAND" will no longer be interpreted as keywords when the policy is set to NEW. Since the policy is not set the OLD behavior will be used. Call Stack (most recent call first): .../Modules/ExternalProject.cmake:1938 (_ep_parse_arguments) CMakeLists.txt:5 (ExternalProject_Add) by avoiding a reference to "${key}" or "COMMAND" in quotes.
* | | | | | | Merge topic 'ExternalProject-retry'Brad King2014-09-221-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30a94eec ExternalProject: Fix download retry logic
| * | | | | | | ExternalProject: Fix download retry logicRuslan Baratov2014-09-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not check file's hash in download script. If hash will not match command ``file(DOWNLOAD ...)`` will fail with FATAL_ERROR, ``cmake -P`` will exit with unsuccessful code, and the build will stop. Leave hash checking to the existing implementation in the verify step.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-221-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-211-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-201-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-09-191-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-09-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-09-171-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'vs10-wince'Brad King2014-09-163-3/+72
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3298f77 VS: Teach VS >= 10 generator about Windows CE
| * | | | | VS: Teach VS >= 10 generator about Windows CEPascal Bach2014-09-153-3/+72
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMAKE_SYSTEM_NAME is 'WindowsCE': * Set the Subsystem and EntryPointSymbol accordingly. * When CMAKE_SYSTEM_VERSION is 8.0 (Windows CE 2013), select the CE800 toolset by default.
* | | | | CMake Nightly Date StampKitware Robot2014-09-161-1/+1
|/ / / /
* | | | Merge topic 'doc-set_test_properties-example'Brad King2014-09-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d8054987 Help: Fix set_tests_properties documentation typo
| * | | | Help: Fix set_tests_properties documentation typoAndrew Bauer2014-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | The example for FAIL_REGULAR_EXPRESSION should actually name it.
* | | | | Merge topic 'vs-generator-platform'Brad King2014-09-1528-14/+111
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be6a555d Tests: Test setting a generator platform in a toolchain file d506fee8 Tests: Use -A option to pass generator platform selection 11c9ddd6 ExternalProject: Use -A option to pass generator platform 29bd843e CTest: Use -A option to pass generator platform selection eb7d8156 cmake: Add -A option to specify a generator platform
| * | | | | Tests: Test setting a generator platform in a toolchain fileBrad King2014-09-159-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the RunCMake.GeneratorPlatform test to cover setting CMAKE_GENERATOR_PLATFORM in a file loaded by CMAKE_TOOLCHAIN_FILE.
| * | | | | Tests: Use -A option to pass generator platform selectionBrad King2014-09-157-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
| * | | | | ExternalProject: Use -A option to pass generator platformBrad King2014-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.