summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'refactor-auto_ptr'Brad King2016-06-3050-173/+381
|\ | | | | | | | | b5ec5b09 Avoid using KWSys auto_ptr by adopting it ourselves
| * Avoid using KWSys auto_ptr by adopting it ourselvesBrad King2016-06-2950-173/+381
| | | | | | | | | | | | | | | | | | | | | | | | Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|'
* | Merge topic 'update-liblzma'Brad King2016-06-307-73/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60212979 Merge branch 'upstream-liblzma' into update-liblzma e4d39146 liblzma 2014-12-21 (265e5ffb) d4f52404 liblzma: Revise update script to get version 5.0.8 bf969198 Merge branch 'upstream-liblzma' into update-liblzma ca4276e4 liblzma: Remove CMake-specific README d38a37ea liblzma 2013-06-30 (b69900ed) ec8f744a Add script to update liblzma from upstream
| * \ Merge branch 'upstream-liblzma' into update-liblzmaBrad King2016-06-295-7/+11
| |\ \ | | | | | | | | | | | | | | | | * upstream-liblzma: liblzma 2014-12-21 (265e5ffb)
| | * | liblzma 2014-12-21 (265e5ffb)liblzma upstream2016-06-296-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://git.tukaani.org/xz.git at commit 265e5ffb70d9c175b424621576294d28807efd9b (v5.0.8).
| * | | liblzma: Revise update script to get version 5.0.8Brad King2016-06-291-1/+1
| | | |
| * | | Merge branch 'upstream-liblzma' into update-liblzmaBrad King2016-06-290-0/+0
| |\ \ \ | | |/ /
| | * | liblzma 2013-06-30 (b69900ed)liblzma upstream2016-06-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://git.tukaani.org/xz.git at commit b69900ed0b2f914fc6c0a180dcb522dbe5b80ea7 (v5.0.5).
| * | | liblzma: Remove CMake-specific READMEBrad King2016-06-291-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | We will now manage the liblzma source tree updates using the `Utilities/Scripts/update-liblzma.bash` script. Drop the README that covered the old method.
| * | | Add script to update liblzma from upstreamDaniel Pfeifer2016-06-291-0/+30
| | | |
* | | | Merge topic 'CM_OVERRIDE-cmTypeMacro'Brad King2016-06-301-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4e8480db cmTypeMacro: mark overridden functions with CM_OVERRIDE
| * | | | cmTypeMacro: mark overridden functions with CM_OVERRIDETobias Hunger2016-06-291-2/+5
| | | | |
* | | | | Merge topic 'CM_OVERRIDE-clang'Brad King2016-06-301-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3f77655d CM_OVERRIDE: fix feature test for clang
| * | | | | CM_OVERRIDE: fix feature test for clangDaniel Pfeifer2016-06-291-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang refuses to default initialize an instance of a class that does not have a default constructor. Fix the check by adding default constructors. Don't use brace initialization like it is proposed in the error message. We want to test the override support independent from the support for brace initialization.
* | | | | CMake Nightly Date StampKitware Robot2016-06-301-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-06-290-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | CMake 3.6.0-rc4v3.6.0-rc4Brad King2016-06-291-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-06-290-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch 'revert-try_compile-config-flags' into releaseBrad King2016-06-285-34/+0
| |\ \ \
| * \ \ \ Merge branch 'doc-cross-reference-lang-standard-and-extensions' into releaseBrad King2016-06-284-2/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'ninja-no-rsp-for-rc' into releaseBrad King2016-06-276-2/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindHDF5-handle-unsuffixed' into releaseBrad King2016-06-271-4/+21
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'GenerateExportHeader-custom-content'Brad King2016-06-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9252441 Tests: Run clang-format on GenerateExportHeader code
| * | | | | | | | Tests: Run clang-format on GenerateExportHeader codeBrad King2016-06-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'cmliblzma-static'Brad King2016-06-291-5/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f05f5b01 cmliblzma: always build as static library
| * | | | | | | | | cmliblzma: always build as static libraryDaniel Pfeifer2016-06-281-5/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'GenerateExportHeader-custom-content'Brad King2016-06-295-4/+28
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 843402b0 GenerateExportHeader: Add option to specify custom content
| * | | | | | | | | GenerateExportHeader: Add option to specify custom contentBrad King2016-06-285-4/+28
| |/ / / / / / / /
* | | | | | | | | Merge topic 'revert-try_compile-config-flags'Brad King2016-06-295-34/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | 943fe6e3 Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
| * | | | | | | Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"Brad King2016-06-285-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.6.0-rc1~160^2 (try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11). The behavior it introduced can break projects that depend on the lack of such behavior. We will have to introduce a policy or other mechanism to enable the behavior in a compatible way. Simply revert it for now. See issue #16174.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-06-291-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'doc-cross-reference-lang-standard-and-extensions'Brad King2016-06-284-2/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | c6a077d6 Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)
| * | | | | | Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)Gregor Jasny2016-06-284-2/+8
| |/ / / / /
* | | | | | Merge topic 'compiler-features'Brad King2016-06-28401-2124/+2303
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 059a6ca0 Merge branch 'unknown-aliased-target' into compiler-features 1d6909a2 use CM_NULLPTR b4b73f56 cxx features: add check for nullptr a7a92390 mark functions with CM_OVERRIDE 9e2d6f0c CM_OVERRIDE: mark destructor overridden in the feature test. 2ca76a66 Validate target name in ALIASED_TARGET property getter
| * \ \ \ \ \ Merge branch 'unknown-aliased-target' into compiler-featuresBrad King2016-06-282-20/+15
| |\ \ \ \ \ \
| | * | | | | | Validate target name in ALIASED_TARGET property getterGregor Jasny2016-06-262-20/+15
| | | | | | | |
| * | | | | | | use CM_NULLPTRDaniel Pfeifer2016-06-28201-1075/+1143
| | | | | | | |
| * | | | | | | cxx features: add check for nullptrDaniel Pfeifer2016-06-274-0/+23
| | | | | | | |
| * | | | | | | mark functions with CM_OVERRIDEDaniel Pfeifer2016-06-27216-1034/+1125
| | | | | | | |
| * | | | | | | CM_OVERRIDE: mark destructor overridden in the feature test.Daniel Pfeifer2016-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for two reasons: 1. A compiler might warn about a class that has a virtual member function but no virtual destructor. We don't want to treat the feature as incomplete in this case. 2. MSVC10 supports the override identifier except on destructors. In this case, the feature really is incomplete and we want to detect it as such.
* | | | | | | | Merge topic 'FindHDF5-handle-unsuffixed'Brad King2016-06-281-4/+21
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 234deec2 FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake 963b576f FindHDF5: cache the correct path to the high level libraries 9f2728ce FindHDF5: When component targets not found fallback to compiler wrappers 149539d9 FindHDF5: Handle HDF5 builds with non-suffixed components f30b0fec FindHDF5: correctly add lang to each component target name.
| * | | | | | | FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmakeRobert Maynard2016-06-241-0/+4
| | | | | | | |
| * | | | | | | FindHDF5: cache the correct path to the high level librariesRobert Maynard2016-06-241-3/+3
| | | | | | | |
| * | | | | | | FindHDF5: When component targets not found fallback to compiler wrappersRobert Maynard2016-06-231-0/+6
| | | | | | | |
| * | | | | | | FindHDF5: Handle HDF5 builds with non-suffixed componentsRobert Maynard2016-06-231-0/+7
| | | | | | | |
| * | | | | | | FindHDF5: correctly add lang to each component target name.Robert Maynard2016-06-231-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'ninja-no-rsp-for-rc'Brad King2016-06-286-2/+28
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 15b3f6f0 ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files
| * | | | | | ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC filesBen Boeckel2016-06-276-2/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~174^2 (Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules, 2016-04-06), Ninja learned to look for `CMAKE_NINJA_FORCE_RESPONSE_FILE` in the current scope or the environment in order to force response file usage for all compilation rules. However, on Windows, the RC compiler goes through cmcldeps which does a `replace(output, output + ".dep.obj")` on the command line. However, with a response file (which we name `output + ".rsp"`), the response file path is replaced instead causing the compiler to (correctly) complain that the response file `output + ".dep.obj.rsp"` does not exist. What needs to happen is for cmcldeps to look through the response file, replace *its* contents and place it in the `output + ".dep.obj.rsp"` file. Also add a test which actually compiles an RC file into a library and executable for all generators on Windows and additionally test `CMAKE_NINJA_FORCE_RESPONSE_FILE` for Ninja generators. Fixes #16167.
* | | | | | CMake Nightly Date StampKitware Robot2016-06-281-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2016-06-270-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |