summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain filesBrad King2016-07-0648-151/+265
| | | | | | | | | | | | | | | | | | | | | | | Document these variables. Change our convention for setting these variables from: set(CMAKE_C_FLAGS_INIT "...") to string(APPEND CMAKE_C_FLAGS_INIT " ...") so that any value previously set by a toolchain file will be used. Automate the conversion with: sed -i 's/set *(\(CMAKE_\(C\|CXX\|Fortran\|RC\|ASM\|${[^}]\+}\)_FLAGS\(_[^_]\+\)\?_INIT \+"\)/string(APPEND \1 /' \ Modules/Compiler/*.cmake Modules/Platform/*.cmake and follow up with some manual fixes (e.g. to cases that already meant to append). Also revert the automated changes to contexts that are not protected from running multiple times.
* OpenWatcom: Partially modernize platform information modulesBrad King2016-07-065-0/+24
| | | | | | | Migrate from the old `<os>-<cc>.cmake` layout to the modern `<os>-<id>-<lang>.cmake` layout. Keep settings common to C and C++ in a `Windows-OpenWatcom.cmake` helper module with an include blocker. For now just add both C and CXX settings in the helper module.
* Intel: Do not use GNU-like flags on WindowsBrad King2016-07-055-24/+54
| | | | | | | | | | | Refactor options out of `Modules/Compiler/Intel-{ASM,C,CXX,Fortran}.cmake` into a common helper in `Modules/Compiler/Intel.cmake`. Condition them to be used only on non-Windows hosts where the Intel compiler is GNU-like instead of MSVC-like. Previously this worked only because the options were later overridden by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not set the options in the first place.
* Intel: Do not use MSVC-like flags for FortranBrad King2016-07-051-14/+17
| | | | | | | | | | | Teach `Modules/Platform/Windows-MSVC.cmake` not to use MSVC options for Fortran. We use the `__windows_compiler_msvc` for the Intel Fortran compiler on Windows for other settings, but we do not want the flags. Previously this worked only because the options were later overridden by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not set the options in the first place.
* Strip CMAKE_<LANG>_FLAGS[_<CONFIG>] initializer whitespaceBrad King2016-07-015-18/+22
|
* Merge topic 'clang-format-script'Brad King2016-07-011-4/+8
|\ | | | | | | | | a77d597b clang-format.bash: Fix filter-branch example documentation
| * clang-format.bash: Fix filter-branch example documentationBrad King2016-06-301-4/+8
| | | | | | | | | | | | Inside `git filter-branch --tree-filter` we must format all tracked files because formatting of the tree for each commit is independent from earlier commits.
* | Merge topic 'cmake-gui-static-xcb'Brad King2016-07-012-0/+11
|\ \ | | | | | | | | | | | | 73a3c0cd cmake-gui: Add build option to use Qt5 xcb plugin statically
| * | cmake-gui: Add build option to use Qt5 xcb plugin staticallyBrad King2016-06-302-0/+11
| | | | | | | | | | | | This will enable builds against a static Qt5.
* | | Merge topic 'doc-updates'Brad King2016-07-012-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | c05d240e Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example dab3ccf2 InstallRequiredSystemLibraries: Document UCRT option use case
| * | | Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES exampleBrad King2016-06-301-0/+16
| | | | | | | | | | | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
| * | | InstallRequiredSystemLibraries: Document UCRT option use caseBrad King2016-06-301-2/+2
| | | | | | | | | | | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
* | | | CMake Nightly Date StampKitware Robot2016-07-011-1/+1
| |/ / |/| |
* | | Merge topic 'try_compile-config-flags'Brad King2016-06-3011-1/+166
|\ \ \ | | | | | | | | | | | | | | | | d582c23a try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG>
| * | | try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG>Brad King2016-06-2911-1/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the `try_compile` source file signature we propagate the caller's value of `CMAKE_<LANG>_FLAGS` into the test project. Extend this to propagate `CMAKE_<LANG>_FLAGS_<CONFIG>` too instead of always using the default value in the test project. This will be useful, for example, to allow the MSVC runtime library to be changed (e.g. `-MDd` => `-MTd`). However, some projects may currently depend on this not being done, so we need to activate the behavior using a policy. This change was originally made by commit v3.6.0-rc1~160^2 (try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11) but without the policy and so had to be reverted during the 3.6 release candidate cycle. Fixes #16174.
* | | | 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
| |\ \ \ \ \ \ \
generated by cgit v0.12 at 2024-12-29 06:51:31 (GMT)