summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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 'autogen-fixes'Brad King2014-09-222-31/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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-182-30/+35
| | | | | | | | | | | | | | | | | | | | 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-171-1/+2
| | | | | | | | | | | | | | | | 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.
* | | | | 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 'vs-generator-platform'Brad King2014-09-154-2/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | CTest: Use -A option to pass generator platform selectionBrad King2014-09-152-2/+2
| | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
| * | cmake: Add -A option to specify a generator platformBrad King2014-09-152-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the 'cmake -A' option to set CMAKE_GENERATOR_PLATFORM without having to spell out the whole variable name. We choose the name '-A' for "platform" because '-P' is already taken, and in the common use case the "platform" is actually an architecture (e.g. x64). Teach the RunCMake test infrastructure to use -A to pass the generator platform. Extend the RunCMake.GeneratorPlatform test with a case to verify that the -A option cannot be repeated.
* | | Merge topic 'if-sanity'Brad King2014-09-1513-727/+1096
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 858d5a0b Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin e177e7af FPHSA: Avoid if() dereferencing of quoted variable 425acc52 cmcurl: Use if(DEFINED) to simplify conditions cede5cbd libarchive: Avoid depending on if() to dereference a quoted variable 2d97178b FindGTK2: Avoid depending on if() to dereference a quoted variable 0b12815d Modules/Test*.cmake: Use if(DEFINED) to simplify conditions 188a1f23 If: Introduce policy CMP0054 - don't dereference quoted variables in if() b900c1cc If: Extract cmConditionEvaluator from if() implementation
| * | | Fix if() checks of CMAKE_SYSTEM_NAME on CygwinBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_SYSTEM_NAME is "CYGWIN", but we also define a variable named "CYGWIN" to "1". Avoid allowing if() to expand the "CYGWIN" string as a variable.
| * | | If: Introduce policy CMP0054 - don't dereference quoted variables in if()Nils Gladitz2014-09-1112-93/+379
| | | |
| * | | If: Extract cmConditionEvaluator from if() implementationNils Gladitz2014-09-116-720/+803
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-141-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-131-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-121-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-111-1/+1
| | | |
* | | | Merge topic 'vs-generator-platform'Brad King2014-09-1016-59/+208
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09c8ad99 enable_language: Initialize system-specific generator info only once 09ab207c Tests: Add generator platform support 6944997b ExternalProject: Propagate the generator platform 8d332091 CTest: Add options to set generator platform b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8 0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option 4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable 68d4280a VS: Refactor internal default platform name selection ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods 03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
| * | | enable_language: Initialize system-specific generator info only onceBrad King2014-09-101-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | Call SetSystemName, SetGeneratorPlatform, and SetGeneratorToolset exactly once after reading CMakeSystem.cmake, and not again on another call to enable_language() or project().
| * | | CTest: Add options to set generator platformBrad King2014-09-054-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ctest_configure command already reads the CTEST_CMAKE_GENERATOR variable to get the value for the cmake -G option. Read new variable CTEST_CMAKE_GENERATOR_PLATFORM to pass on as CMAKE_GENERATOR_PLATFORM. The "ctest --build-and-test" mode already has "--build-generator" to specify the -G option to CMake. Add a "--build-generator-platform" option to specify a value to pass on as CMAKE_GENERATOR_PLATFORM.
| * | | VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8Brad King2014-09-056-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For VS generator names that do not specify the platform name, read CMAKE_GENERATOR_PLATFORM to get it. Extend the RunCMake.GeneratorPlatform test with a case covering use of the x64 platform when the test generator is a Visual Studio generator whose name does not specify a platform.
| * | | CMake: Add CMAKE_GENERATOR_PLATFORM optionBrad King2014-09-055-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject the option by default. It will be implemented on a per-generator basis. Pass the setting into try_compile project generation. Add cache entry CMAKE_GENERATOR_PLATFORM and associated variable documentation to hold the value persistently. Add a RunCMake.GeneratorPlatform test to cover basic use cases for the option. Verify that CMAKE_GENERATOR_PLATFORM is empty by default, and that it is rejected when the generator does not support a user setting.
| * | | VS: Refactor internal default platform name selectionBrad King2014-09-053-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | Rename the 'PlatformName' member to 'DefaultPlatformName' and make sure it is only read through a 'GetPlatformName()' call. This will allow non-default names to be chosen later.
| * | | cmGlobalVisualStudio10Generator: Re-order some methodsBrad King2014-09-052-14/+14
| | | | | | | | | | | | | | | | | | | | Order SetSystemName and SetGeneratorToolset method declarations and definitions as they are called.
| * | | cmGlobalGenerator: Call SetGeneratorToolset even for empty toolsetBrad King2014-09-054-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | Move handling of an empty toolset name into the implementation of the method. This simplifies the VS 10 implementation of default toolset selection because it has one code path that is always called.
* | | | Merge topic 'update-kwsys'Brad King2014-09-103-6/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | daab3b3b Merge branch 'upstream-kwsys' into update-kwsys 92b582a6 KWSys 2014-09-08 (fb77be5a)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-09-093-6/+72
| | | | |
* | | | | Merge topic 'tolerate-lib-dir-symlink'Brad King2014-09-101-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)
| * | | | | Tolerate symlinks during RPATH ordering (#13429)Brad King2014-09-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Arch Linux, /lib and /lib64 are symlinks to /usr/lib. When ordering runtime library search paths, we must not consider these to be distinct directories. Before considering conflicts between two directories, check that they do not have the same 'realpath'. Inspired-by: Myles English <mylesenglish@gmail.com>
* | | | | | CMake Nightly Date StampKitware Robot2014-09-101-1/+1
|/ / / / /
* | | | | CMake Nightly Date StampKitware Robot2014-09-091-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2014-09-081-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-071-1/+1
| | | |