summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'remove-vs6-generator'Brad King2016-03-1078-4224/+67
|\ | | | | | | | | | | b42866a3 Drop Visual Studio 6 generator cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
| * Drop Visual Studio 6 generatorBrad King2016-03-0977-4221/+64
| | | | | | | | | | | | This generator has been deprecated since CMake 3.3. Remove it. Update documentation, modules, and tests to drop content specific to this generator.
| * cmLocalVisualStudio7Generator: Fix name of helper functionBrad King2016-03-091-3/+3
| | | | | | | | | | Rename `cmLVS6G_IsFAT` to `cmLVS7G_IsFAT` since it is for the local VS 7 generator and not VS 6.
* | Merge topic 'update-third-party'Brad King2016-03-101-1/+18
|\ \ | | | | | | | | | | | | | | | | | | 97149ff8 update-third-party: read attributes from the worktree a35f4be6 update-third-party: Add license notice afac3d10 update-third-party: remove empty directories as well
| * | update-third-party: read attributes from the worktreeBen Boeckel2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | This should be done so that any attributes for ignoring certain files when exporting can be appended to the file during the extraction step, but ignored in the actual import. Necessary for importing the gitsetup repository.
| * | update-third-party: Add license noticeBrad King2016-03-091-0/+16
| | | | | | | | | | | | Our Git infrastructure scripts use the "Apache License 2.0".
| * | update-third-party: remove empty directories as wellBen Boeckel2016-03-091-0/+1
| |/ | | | | | | | | | | The `git ls-files | xargs rm` removes only files; directories which are empty are left laying around. This later chokes the `mv` which puts the "reduced" directory into place. Remove the empty directories as well.
* | Merge topic 'clang-iframework-version'Brad King2016-03-101-1/+1
|\ \ | | | | | | | | | | | | 63c4133b OS X: Use -iframework with Clang only on version >= 3.2
| * | OS X: Use -iframework with Clang only on version >= 3.2Jean-Christophe Fillion-Robin2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system framework directories, 2014-05-05) we test the version of Clang is smaller that 3.1 to see if it supports -iframework. Considering that "iframework" support has been added in clang@r142418 (Frontend: Support -iframework.) prior to clang 3.1, this made sense. That said, considering that support for multiple -iframework parameters has been added later in clang@r164607 (-iframework should allow separate arguments. ) prior to clang 3.2, this commit updates the check to enable framework support only if version is >= 3.2
* | | Merge topic 'vs-clang-cl'Brad King2016-03-1015-12/+201
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491b41dd Help: Add notes for topic 'vs-clang-cl' ad6d27ac Tests: do not build PrecompiledHeader on Clang/C2 a0f0541f Tests: fix PDBDirectoryAndName on Clang/C2 3541af67 Tests: fix Plugin building on Clang/C2 1902c293 Tests: fix complexOneConfig building on Clang/C2 cab2ec11 Tests: fix Complex building on Clang/C2 ada3736c Tests: fix Module.GenerateExportHeader building on Clang/C2 123b7e13 Tests: fix AliasTarget building on Clang/C2 445d4d4b VS 14: Add flag map for -std= to CppLanguageStandard tag in project files 0a785eb4 Features: Clang has no cxx_decltype_incomplete_return_type in MSVC sim mode 2c2ec488 VS: in Clang/C2 toolset, setup correct compiler settings 37afe00f CMakeDetermineCompilerId: Add detection of clang.exe bundled with VS
| * | | Help: Add notes for topic 'vs-clang-cl'Brad King2016-03-101-0/+5
| | | |
| * | | Tests: do not build PrecompiledHeader on Clang/C2Mariusz Pluciński2016-03-101-1/+3
| | | |
| * | | Tests: fix PDBDirectoryAndName on Clang/C2Mariusz Pluciński2016-03-101-0/+9
| | | |
| * | | Tests: fix Plugin building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | |
| * | | Tests: fix complexOneConfig building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | |
| * | | Tests: fix Complex building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | |
| * | | Tests: fix Module.GenerateExportHeader building on Clang/C2Mariusz Pluciński2016-03-103-1/+93
| | | |
| * | | Tests: fix AliasTarget building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | |
| * | | VS 14: Add flag map for -std= to CppLanguageStandard tag in project filesMariusz Pluciński2016-03-101-0/+18
| | | | | | | | | | | | | | | | This is used by the Clang/C2 toolset.
| * | | Features: Clang has no cxx_decltype_incomplete_return_type in MSVC sim modeMariusz Pluciński2016-03-101-1/+3
| | | |
| * | | VS: in Clang/C2 toolset, setup correct compiler settingsMariusz Pluciński2016-03-103-8/+37
| | | |
| * | | CMakeDetermineCompilerId: Add detection of clang.exe bundled with VSMariusz Pluciński2016-03-101-1/+5
| | |/ | |/| | | | | | | | | | When using a clang toolset we need to find `clang.exe` instead of `cl.exe`.
* | | Merge topic 'update-osx-release'Brad King2016-03-101-0/+5
|\ \ \ | | | | | | | | | | | | | | | | 43fbcba2 Help: Add notes for topic 'update-osx-release'
| * | | Help: Add notes for topic 'update-osx-release'Brad King2016-03-091-0/+5
| | | |
* | | | Merge topic 'FindJNI-ubuntu-paths'Brad King2016-03-101-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1b029ea9 FindJNI: Append path only "if(EXISTS" add25578 FindJNI: Add support for Ubuntu 15.10
| * | | | FindJNI: Append path only "if(EXISTS"O. Libre2016-03-091-2/+6
| | | | |
| * | | | FindJNI: Add support for Ubuntu 15.10O. Libre2016-03-091-0/+9
| | |/ / | |/| | | | | | | | | | | | | | - Reuse JAVA_APPEND_LIBRARY_DIRECTORIES for JAVA_AWT_INCLUDE_DIRECTORIES - Append three directories /usr/lib/jvm/java-{8,7,6}-openjdk-{libarch}
* | | | Merge topic 'xcode-regenerate-on-deleted-files'Brad King2016-03-102-9/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 111cd679 Xcode: ReRunCMake even if files disappeared (#15992)
| * | | | Xcode: ReRunCMake even if files disappeared (#15992)Gregor Jasny2016-03-092-9/+57
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2016-03-101-1/+1
|/ / /
* | | Merge topic 'update-kwsys'Brad King2016-03-094-13/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | ea04ec09 Merge branch 'upstream-KWSys' into update-kwsys 4ba9b473 KWSys 2016-03-08 (6b60c184)
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-084-13/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-03-08 (6b60c184)
| | * | | KWSys 2016-03-08 (6b60c184)KWSys Upstream2016-03-084-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 6b60c1843dbba9d4929496f9292cc78dab945c68 (master). Upstream Shortlog ----------------- Mariusz Pluciński (1): 6b60c184 SystemInformation: Fix compilation on VS Clang/C2 toolset Sean McBride (3): 6ea22e65 Suppressed clang -Wcomma warnings with void cast 8d9d489d Fixed clang-tidy warnings about macros missing defensive parens 1c544330 Made private method static to silence warning
* | | | | Merge topic 'deprecate-CMakeForceCompiler'Brad King2016-03-093-11/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d929c35f CMakeForceCompiler: Deprecate this module and its macros
| * | | | | CMakeForceCompiler: Deprecate this module and its macrosBrad King2016-03-083-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We originally deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19). Then a use case was found to still require the module so the deprecation was reverted for CMake 3.5 by commit v3.5.0-rc3~4^2 (CMakeForceCompiler: De-deprecate until more use cases have alternatives, 2016-02-17). Since then `CMAKE_TRY_COMPILE_TARGET_TYPE` was introduced to provide an alternative solution for that use case. Deprecate the module again.
* | | | | | Merge topic 'add-FindLTTngUST'Brad King2016-03-099-1/+182
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4194deb Add FindLTTngUST module to find LTTng-UST library
| * | | | | | Add FindLTTngUST module to find LTTng-UST libraryPhilippe Proulx2016-03-079-1/+182
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also detect the library version number. Provide results as variables and as an imported target, LTTng::UST. Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
* | | | | | Merge topic 'GetPrerequisites-canonical-path'Brad King2016-03-091-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37e8ccee GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths
| * | | | | | GetPrerequisites: Fix gp_resolved_file_type on non-canonical pathsBrad King2016-03-081-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canonicalize the input paths so we treat them both consistently, in particular when comparing them via string operations. This is needed for calls like fixup_bundle("${CMAKE_INSTALL_PREFIX}/../test" ...) Suggested-by: Benjamin Ballet <bballet@ivsweb.com>
* | | | | | CMake Nightly Date StampKitware Robot2016-03-091-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release'Brad King2016-03-080-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | CMake 3.5.0v3.5.0Brad King2016-03-081-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-03-080-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'doc-find-python-call-order' into releaseBrad King2016-03-072-6/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-03-071-0/+28
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-03-080-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | 3aa6fea6 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)
| * | | | | | VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-03-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge topic 'ninja-osx-versions'Brad King2016-03-085-37/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e165a64 Ninja: Add OS X dylib versioning (#14140) 1f2b39c6 cmCommonTargetGenerator: Adopt AppendOSXVerFlag method
| * | | | | | | Ninja: Add OS X dylib versioning (#14140)Bruce Stephens2016-03-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Ninja generator to add the `-current_version` and the `-compatibility_version` flags based on the VERSION and SOVERSION target properties just as the Makefile generators do. Signed-off-by: Bruce Stephens <bruce.r.stephens@gmail.com>
| * | | | | | | cmCommonTargetGenerator: Adopt AppendOSXVerFlag methodBruce Stephens2016-03-074-37/+35
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move this method from cmMakefileLibraryTargetGenerator so it can be re-used for the Ninja generator too. Signed-off-by: Bruce Stephens <bruce.r.stephens@gmail.com>
generated by cgit v0.12 at 2025-02-10 05:19:22 (GMT)