summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindHDF5: remove mark_as_advanced for non-cached variablesKris Thielemans2017-03-011-7/+0
|
* FindHDF5: add HDF5_FIND_DEBUG variable to get debugging outputKris Thielemans2017-02-281-0/+23
|
* FindHDF5: hide HDF5_DIR if HDF5 was found in another wayKris Thielemans2017-02-281-0/+6
|
* Merge branch 'release'Brad King2017-02-270-0/+0
|\
| * Merge branch 'ExternalProject-checkout-clarify' into releaseBrad King2017-02-241-1/+1
| |\
| * \ Merge branch 'object-library-compile-pdb' into releaseBrad King2017-02-242-1/+2
| |\ \
| * \ \ Merge branch 'ninja-no-full-path' into releaseBrad King2017-02-241-4/+3
| |\ \ \
* | \ \ \ Merge branch 'release-3.7'Brad King2017-02-270-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ninja-no-full-path' into release-3.7Brad King2017-02-241-4/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge topic 'ExternalProject-checkout-clarify'Brad King2017-02-271-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | a9fa6a2c ExternalProject: Run `git checkout` with `--` to clarify arguments
| * | | | | ExternalProject: Run `git checkout` with `--` to clarify argumentsBrad King2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the case when the tag name to be checked out also happens to match a path name. Fixes: #16678
* | | | | | Merge topic 'object-library-compile-pdb'Brad King2017-02-272-1/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
| * | | | | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-242-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'test-objlib-deps-cleanup'Brad King2017-02-2710-36/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C 01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay
| * | | | | Tests: Change RunCMake.ObjectLibrary dependencies case to CBrad King2017-02-2610-31/+27
| | | | | |
| * | | | | Tests: Fix RunCMake.ObjectLibrary dependency delayBrad King2017-02-261-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sleep before the second copy to avoid the need for a touch. Sleep for longer on generators whose build tools have low resolution timestamps.
* | | | | | 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 branch 'release'Brad King2017-02-240-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'vcxproj-indentation' into releaseBrad King2017-02-231-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'clang-format-attrs' into releaseBrad King2017-02-229-44/+60
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-cmake-language-makefile-vars' into releaseBrad King2017-02-221-0/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindCUDA-fix-init' into releaseBrad King2017-02-221-0/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'GetPrerequisites-find_item_basename'Brad King2017-02-241-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eacf7dec GetPrerequisites: also try to resolve just the basename
| * | | | | | | | | GetPrerequisites: also try to resolve just the basenameMichael Maltese2017-02-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #16625.
* | | | | | | | | | Merge topic '16615-xcode-object-libraries-depends'Brad King2017-02-249-49/+121
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Add test for object library dependenciesGregor Jasny2017-02-226-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16615
| * | | | | | | | | 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 'find_openmp_clang_patch'Brad King2017-02-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dc7a2ed FindOpenMP: Add iomp5 variant of Clang OpenMP flags
| * | | | | | | | | | FindOpenMP: Add iomp5 variant of Clang OpenMP flagsLucas Czech2017-02-231-0/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try `-fopenmp=libiomp5` in addition to `-fopenmp=libomp`. Leave the latter as the default that we try first when the compiler id is `Clang`. If that does not work we will still fall back to trying all the candidates and eventually get to the iomp5 variant.
* | | | | | | | | | Merge topic 'autogen_depends'Brad King2017-02-2422-101/+280
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 documentationSebastian Holtermann2017-02-237-0/+75
| | | | | | | | | | |
| * | | | | | | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS testSebastian Holtermann2017-02-2210-6/+46
| | | | | | | | | | |
| * | | | | | | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS supportSebastian Holtermann2017-02-225-10/+55
| | | | | | | | | | |
| * | | | | | | | | | 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.