summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2017-01-251-1/+1
|
* Merge topic '16253-xcode-effective-platform-name'Brad King2017-01-245-4/+25
|\ | | | | | | | | 10c9c73d Xcode: Control emission of EFFECTIVE_PLATFORM_NAME
| * Xcode: Control emission of EFFECTIVE_PLATFORM_NAMEGregor Jasny2017-01-205-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with multiple SDKs within one project Xcode requires the usage of ${EFFECTIVE_PLATFORM_NAME} to put temporary and build outout into separate directories. For example an iOS device and simulator build use two different SDKs (iphoneos and iphonesimulator). In the past cmake tries to detect embedded toolchains that could possibly use simulators and emitted EFFECTIVE_PLATFORM_NAME (EPN) at the proper locations. In #16253 Mark noticed that if he uses macosx and iphoneos in combination the necessary EPN is not emitted. This is because CMake by default assumes macosx SDK which does not trigger EPN emission. The fist naive approach - enabling EPN unconditionally revealed that then the EPN leaks into generator expressions like $<TARGET_FILE:xxx> which might be a regression and thus is unacceptable. The next approach was to add an CMake property to enable EPN emission unconditionally. This solved the reported problem. But the EPN leakage also happened for the embedded toolchains already without anyone noticing. So the control property was turned into a tri-state one: * No definition: EPN is activated for embedded toolchains like before * ON: EPN is always emitted * OFF: EPN is never emitted That approach gives the user the chance to disable EPN for embedded toolchains and restores generator expression functionality for those. Closes: #16253
* | Merge topic 'qtdialog-trim-new-varname'Brad King2017-01-241-1/+1
|\ \ | | | | | | | | | | | | 8f1bce12 cmake-gui: trim spaces from user-created variable names
| * | cmake-gui: trim spaces from user-created variable namesClinton Stimpson2017-01-201-1/+1
| | | | | | | | | | | | Fixes: #15955
* | | Merge topic 'csproj-improvements'Brad King2017-01-241-25/+184
|\ \ \ | | | | | | | | | | | | | | | | | | | | 4bfb1249 VS: removed usage of relative paths for C# targets in in-source builds 90cb4083 VS: improve handling of source files with special extensions in .csproj
| * | | VS: removed usage of relative paths for C# targets in in-source buildsMichael Stürmer2017-01-181-6/+0
| | | |
| * | | VS: improve handling of source files with special extensions in .csprojMichael Stürmer2017-01-181-19/+184
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly <Link> and <DependentUpon> tags are added to connect generated and manually edited files. Special file extensions that are take care of are: - .Designer.cs - .xaml.cs - .settings - .resx - .xaml
* | | CMake Nightly Date StampKitware Robot2017-01-241-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2017-01-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2017-01-221-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2017-01-211-1/+1
| | |
* | | Merge topic 'case-insensitive-bindir-detection'Brad King2017-01-201-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 7f0a21a5 cmSystemTools: use the actual case for root detection
| * | | cmSystemTools: use the actual case for root detectionBen Boeckel2017-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, calling a binary installed with the default `bin` binary directory will fail to be detected when called as `BIN\cmake.exe` due to the string compare. Get the actual case of the path before checking that the path ends with `CMAKE_BIN_DIR`. Fixes #16574.
* | | | Merge topic 'cpack-ifw-new-installer-options'Brad King2017-01-202-3/+141
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying wizard style
| * | | | QtIFW: Added new options to QtIFW cpack generator for modifying wizard styleAlexander Voitenko2017-01-172-3/+141
| | | | |
* | | | | Merge topic '16165-manually-added-dependencies'Brad King2017-01-201-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d9f836e9 Add a getter for manually added target dependencies
| * | | | | Add a getter for manually added target dependenciesGregor Jasny2017-01-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #16165
* | | | | | Merge topic 'cdash_upload_retry'Brad King2017-01-204-45/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05ed82b1 ctest_submit: Update documentation for CDash upload retries 0ce7643a ctest_submit: improve handling of QUIET option 5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD
| * | | | | | ctest_submit: improve handling of QUIET optionZack Galbreath2017-01-203-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the CDASH_UPLOAD signature of ctest_submit() to more thoroughly respect the QUIET option.
| * | | | | | ctest_submit: Allow RETRY_COUNT for CDASH_UPLOADZack Galbreath2017-01-203-36/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the CDASH_UPLOAD signature of ctest_submit() to honor the RETRY_COUNT and RETRY_DELAY options. Also teach HttpRequest() to honor the default 120 second timeout for curl connections.
* | | | | | | CMake Nightly Date StampKitware Robot2017-01-201-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-01-191-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-01-181-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'cmCTestBuildHandler-fix-warning'Brad King2017-01-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f3864452 cmCTestBuildHandler: Fix warning in FragmentCompare signature
| * | | | | cmCTestBuildHandler: Fix warning in FragmentCompare signatureBrad King2017-01-161-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` warning: the specified comparator type does not provide a const call operator [-Wuser-defined-warnings] ``` Reported-by: Sean McBride <sean@rogue-research.com>
* | | | | Merge topic 'update-kwsys'Brad King2017-01-173-7/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee77941a Merge branch 'upstream-KWSys' into update-kwsys 219c7bdc KWSys 2017-01-16 (a423d829)
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-01-163-7/+60
| |/ / / / | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-01-16 (a423d829)
* | | | | Merge topic 'fixtureUnusedOrdering'Brad King2017-01-171-22/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 298b5b31 CTest: Ensure setup/cleanup ordering even when fixture not required
| * | | | | CTest: Ensure setup/cleanup ordering even when fixture not requiredCraig Scott2017-01-161-22/+60
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #16558
* | | | | | Merge topic 'file-GLOB-empty-no-crash'Brad King2017-01-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bba0bfc file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
| * | | | | | file: Fix crash on GLOB with no expressions after LIST_DIRECTORIESBrad King2017-01-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no expression causes a crash. Fix the logic to avoid the crash. Fixes: #16565
* | | | | | Merge topic 'expand_custom_commands'Brad King2017-01-178-25/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c8ab7dd add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option
| * | | | | | add_custom_{command,target}: Add COMMAND_EXPAND_LISTS optionEd Branch2017-01-148-25/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option allows lists generated by generator expressions to be expanded. Closes: #15935
* | | | | | | CMake Nightly Date StampKitware Robot2017-01-171-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'source_group-tree'Brad King2017-01-162-0/+171
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b42330be source_group: Add options create groups matching directory tree
| * | | | | | source_group: Add options create groups matching directory treeMateusz Janek2017-01-162-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `TREE` and `PREFIX` arguments to enable this behavior.
* | | | | | | Merge topic 'csharp_simple'Brad King2017-01-162-71/+364
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397b8546 VS: added documentation for C# support a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015) 6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
| * | | | | | | VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)Michael Stürmer2017-01-132-69/+363
| | | | | | | |
| * | | | | | | VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPSMichael Stürmer2017-01-131-2/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'Autogen_Config'Brad King2017-01-163-340/+451
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb670d96 Autogen: Generators: Remove space 3f86032b Autogen: Generators: Rename requiresMocing method f24e1d37 Autogen: Generators: Fix clang-tidy readability-else-after-return f27c5852 Autogen: Initializer: Add old settings file to clean files d7d2cb48 Autogen: Generators: Save the UIC/RCC settings that were actually used 721997a7 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC 9f47d326 Autogen: Generators: Save the MOC settings that were actually used 597124ba Autogen: Generators: Add function to read makefile definitions config aware 2b400b24 Autogen: Generators: Move moc/uic/rcc executable test to generate method edf0b8a5 Autogen: Generators: Rename GenerateFoo methods to FooGenerate 06430919 Autogen: Generators: Use FileAbsentOrOlder for UIC tests ca179f2a Autogen: Generators: Use FileAbsentOrOlder for MOC tests 119791ae Autogen: Generators: Introduce FileAbsentOrOlder function 95e4cfc5 Autogen: Generators: Simplify (and fix) JoinExts function 6c55755b Autogen: Generators: Make class static method a source static function 1491ab1c Autogen: Generators: Make class static method a source static function ...
| * | | | | | | Autogen: Generators: Remove spaceSebastian Holtermann2017-01-121-1/+0
| | | | | | | |
| * | | | | | | Autogen: Generators: Rename requiresMocing methodSebastian Holtermann2017-01-122-5/+5
| | | | | | | |
| * | | | | | | Autogen: Generators: Fix clang-tidy readability-else-after-returnSebastian Holtermann2017-01-121-5/+5
| | | | | | | |
| * | | | | | | Autogen: Initializer: Add old settings file to clean filesSebastian Holtermann2017-01-121-0/+8
| | | | | | | |
| * | | | | | | Autogen: Generators: Save the UIC/RCC settings that were actually usedSebastian Holtermann2017-01-122-31/+118
| | | | | | | |
| * | | | | | | Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCCSebastian Holtermann2017-01-122-7/+11
| | | | | | | |
| * | | | | | | Autogen: Generators: Save the MOC settings that were actually usedSebastian Holtermann2017-01-122-52/+59
| | | | | | | |
| * | | | | | | Autogen: Generators: Add function to read makefile definitions config awareSebastian Holtermann2017-01-121-57/+47
| | | | | | | |
| * | | | | | | Autogen: Generators: Move moc/uic/rcc executable test to generate methodSebastian Holtermann2017-01-121-12/+18
| | | | | | | |