summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-host-system-name'Brad King2017-02-281-1/+1
|\ | | | | | | | | c1aaf8a6 Fix CMAKE_HOST_SYSTEM_NAME on SunOS
| * Fix CMAKE_HOST_SYSTEM_NAME on SunOSBrad King2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | In commit 0bbd993f (Make CMAKE_HOST_SYSTEM_NAME available in scripting context, 2016-12-26) we added a call to `uname` that checks for a zero return value. However, on Solaris the `uname(2)` manual [1] says that on success a non-negative value is returned. Fix our return code check so that we detect the `SunOS` name correctly. [1] https://docs.oracle.com/cd/E53394_01/html/E54765/uname-2.html
* | CMake Nightly Date StampKitware Robot2017-02-281-1/+1
| |
* | Merge topic 'object-library-compile-pdb'Brad King2017-02-271-1/+1
|\ \ | | | | | | | | | | | | feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
| * | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When `COMPILE_PDB_NAME` is used without `COMPILE_PDB_OUTPUT_DIRECTORY` we cannot fall back on the link `PDB_OUTPUT_DIRECTORY` for an object library because it has no link step. Fixes: #16674
* | | Merge topic 'ninja-no-full-path'Brad King2017-02-271-4/+3
|\ \ \ | | | | | | | | | | | | | | | | 666ad1df Revert "Ninja: Use full path for all source files"
| * | | Revert "Ninja: Use full path for all source files"Brad King2017-02-241-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files, 2016-08-05). Unfortunately using absolute paths can cause incorrect rebuilds due to ninja limitations. The ninja manual [1] explains: > ... using absolute paths, your depfile may result in a mixture of > relative and absolute paths. Paths used by other build rules need > to match exactly. Passing an absolute path to a source file to the compiler while using a relative path in the ninja build manifest can cause such mixture and lead to incorrect rebuilds. Simply revert the change for now. Note that there was a follow-up to the original change in commit v3.7.0-rc2~10^2 (Ninja: Fix RC language depfile generation with cmcldeps, 2016-10-13). We don't need to revert that because that change made the relevant code cleverly adapt to whatever variable we use to reference the source file. [1] https://ninja-build.org/manual.html#_deps Fixes: #16675 Issue: #13894
* | | | CMake Nightly Date StampKitware Robot2017-02-271-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-02-261-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-02-251-1/+1
| | | |
* | | | Merge topic '16615-xcode-object-libraries-depends'Brad King2017-02-243-49/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 624021a0 Add test for object library dependencies 5da9266a Xcode: Always track object library dependencies via hacky Makefile e80ac953 Xcode: Record dependency information also for object libraries 9293e57d Xcode: Collect dummy rules during iteration and emit afterwards 33a1d727 Makefile: Allow adding post-build rules to object libraries
| * | | | Xcode: Always track object library dependencies via hacky MakefileGregor Jasny2017-02-221-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use the dependency tracker Makefile to ensure targets that depend on object libraries are up-to-date. For all other target types we use the hack only for Xcode < 5. Fixes: #16615
| * | | | Xcode: Record dependency information also for object librariesGregor Jasny2017-02-221-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode seems to have troubles to track target dependecies to object files. This may lead to stale targets as reported in issue #16615. As a work-around the pre-Xcode 5 dependecy tracker hack with post-build make files is extended to also take object libraries into account.
| * | | | Xcode: Collect dummy rules during iteration and emit afterwardsGregor Jasny2017-02-221-24/+13
| | | | |
| * | | | Makefile: Allow adding post-build rules to object librariesGregor Jasny2017-02-223-4/+15
| | | | |
* | | | | Merge topic 'dragndrop-format'Brad King2017-02-241-20/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 356068cd cmCPackDragNDropGenerator: Improving handling of temporary dmg images
| * | | | | cmCPackDragNDropGenerator: Improving handling of temporary dmg imagesClinton Stimpson2017-02-231-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the image format to create the initial `dmg`, and convert only when necessary. This eliminates spurious hdiutil create -format UDRW failures I'm seeing which may be related to an anti-virus scanner. Running hdiutil create -format UDRW -verbose indicates a "resource is busy" issue when unmounting an image.
* | | | | | Merge topic 'vcxproj-indentation'Brad King2017-02-241-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cb165e8 VS: Fix .vcxproj indentation
| * | | | | | VS: Fix .vcxproj indentationBrad King2017-02-231-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.8.0-rc1~87^2~1 (VS: added support for C#, 2017-01-09) we removed what looked like a no-op streaming operation but in fact it is responsible for applying indentation. Restore the line.
* | | | | | Merge topic 'autogen_depends'Brad King2017-02-244-95/+158
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62a1e292 Autogen: Add hint to SKIP_AUTOMOC in error message e98465cf Autogen: Add Quote function and use it for logging 96f6f392 Autogen: Add AUTOMOC_DEPEND_FILTERS documentation 94e3f82c Autogen: Add AUTOMOC_DEPEND_FILTERS test 70ebf35c Autogen: Add AUTOMOC_DEPEND_FILTERS support 2a6fd432 Autogen: Single point of return in Run() method e9a8a207 Autogen: Log simplifications
| * | | | | | Autogen: Add hint to SKIP_AUTOMOC in error messageSebastian Holtermann2017-02-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15751
| * | | | | | Autogen: Add Quote function and use it for loggingSebastian Holtermann2017-02-231-51/+73
| | | | | | |
| * | | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS supportSebastian Holtermann2017-02-224-10/+54
| | | | | | |
| * | | | | | Autogen: Single point of return in Run() methodSebastian Holtermann2017-02-221-15/+19
| | | | | | |
| * | | | | | Autogen: Log simplificationsSebastian Holtermann2017-02-221-24/+15
| | | | | | |
* | | | | | | Merge topic 'cmake-server-aix'Brad King2017-02-241-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c14db25 cmServerConnection.h: Include cmConfigure.h first
| * | | | | | | cmServerConnection.h: Include cmConfigure.h firstBrad King2017-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to make Large File Support definitions consistent with other translation units.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-02-241-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'clang-format-attrs'Brad King2017-02-232-10/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5f39a56 clang-format.bash: Use Git attributes to mark files for formatting f6986ee4 Define a custom Git attribute to mark sources using our C style 2256c3a7 Define a custom Git attribute to mark source files as generated
| * | | | | | clang-format.bash: Use Git attributes to mark files for formattingBrad King2017-02-222-0/+5
| | | | | | |
| * | | | | | Define a custom Git attribute to mark source files as generatedBrad King2017-02-221-10/+17
| | | | | | |
| * | | | | | Merge branch 'execute_process-default-encoding' into releaseBrad King2017-02-131-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-231-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'autogen_json'Brad King2017-02-225-1116/+1309
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test d60f1ddc Autogen: Documentation update cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support 8b13a52c Autogen: Tests: Set different compression levels in rcc test 9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation 0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function 754d4318 Autogen: Sort AutogenInfo.cmake.in cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test 39c4819e Autogen: Tests: Add moc include tests 50805693 Autogen: Tests: Clean comments c23206b6 Autogen: Log simplifications 347572cf Autogen: Only touch an unchanged moc_compilation.cpp 03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes 3ec230de Autogen: Use GetRealPath in central places only 41fb64e7 Autogen: Search moc includes in include directories 175c8900 Autogen: Sort includes before composing include options ...
| * | | | | | Autogen: Overhaul and simplify AutogenInfo.cmake file generationSebastian Holtermann2017-02-211-315/+318
| | | | | | |
| * | | | | | Autogen: Optimize GetCompileDefinitionsAndDirectories functionSebastian Holtermann2017-02-211-18/+20
| | | | | | |
| * | | | | | Autogen: Sort AutogenInfo.cmake.inSebastian Holtermann2017-02-212-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename AM_SKIP_MOC to AM_MOC_SKIP and AM_SKIP_UIC to AM_UIC_SKIP
| * | | | | | Autogen: Log simplificationsSebastian Holtermann2017-02-212-125/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logging methods now automatically add an end-of-line to the message if it is missing.
| * | | | | | Autogen: Only touch an unchanged moc_compilation.cppSebastian Holtermann2017-02-211-36/+37
| | | | | | |
| * | | | | | Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changesSebastian Holtermann2017-02-212-83/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15419
| * | | | | | Autogen: Use GetRealPath in central places onlySebastian Holtermann2017-02-211-27/+18
| | | | | | |
| * | | | | | Autogen: Search moc includes in include directoriesSebastian Holtermann2017-02-212-11/+36
| | | | | | |
| * | | | | | Autogen: Sort includes before composing include optionsSebastian Holtermann2017-02-211-34/+33
| | | | | | |
| * | | | | | Autogen: Add FindInIncludeDirectories methodSebastian Holtermann2017-02-212-0/+21
| | | | | | |
| * | | | | | Autogen: Synchronize header/source argument namesSebastian Holtermann2017-02-211-10/+10
| | | | | | |
| * | | | | | Autogen: Split moc include paths on info readingSebastian Holtermann2017-02-212-20/+18
| | | | | | |
| * | | | | | Autogen: Loop based macro detection instead of code duplicationSebastian Holtermann2017-02-212-20/+24
| | | | | | |
| * | | | | | Autogen: Issue a warning if moc isn't required in strict modeSebastian Holtermann2017-02-211-0/+9
| | | | | | |
| * | | | | | Autogen: Error message tweaksSebastian Holtermann2017-02-211-18/+17
| | | | | | |
| * | | | | | Autogen: Acquire and store header extensions in Init()Sebastian Holtermann2017-02-212-61/+50
| | | | | | |