summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge topic 'doc-osx-versions'Brad King2016-06-273-13/+43
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 00caa1dd Help: Describe VERSION and SOVERSION meanings for Mach-O binaries
| * | | | | | | | Help: Describe VERSION and SOVERSION meanings for Mach-O binariesBartosz Kosiorek2016-06-233-13/+43
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge topic 'GetPrerequisites-typo'Brad King2016-06-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49a07d7a Merge branch 'backport-GetPrerequisites-typo' into GetPrerequisites-typo 8b3ffbe4 GetPrerequisites: fix typo in comment 460a589d GetPrerequisites: fix typo in comment
| * \ \ \ \ \ \ \ Merge branch 'backport-GetPrerequisites-typo' into GetPrerequisites-typoBrad King2016-06-230-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-221-1/+1
| | |/ / / / / /
| * | | | | | | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-231-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-06-271-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-06-261-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-241-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'vs-tool-override'Brad King2016-06-236-1/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ed05f11d VS: Add a VS_TOOL_OVERRIDE source file property
| * | | | | VS: Add a VS_TOOL_OVERRIDE source file propertyGilles Khouzam2016-06-206-1/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property allow to specify a specific Visual Studio tool for a source file overriding the default tool behavior. For example, a `.resw` file being processed as a `PriResource` file. This has the advantage of being able to teach CMake to process new file types without code modifications.
* | | | | | Merge topic 'vs-sdk-refs'Brad King2016-06-235-1/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35a6cac2 VS: Add VS_SDK_REFERENCES target property to reference external SDKs
| * | | | | | VS: Add VS_SDK_REFERENCES target property to reference external SDKsGilles Khouzam2016-06-225-1/+37
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Allow one to specify external SDK references such as `Microsoft.AdMediatorWindows81, Version=1.0`.
* | | | | | Merge topic 'xcode-bundle-extension'Brad King2016-06-232-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION
| * | | | | Xcode: Properly handle BUNDLE_EXTENSIONGregor Jasny2016-06-182-1/+5
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-231-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release'Brad King2016-06-220-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | CMake 3.6.0-rc3v3.6.0-rc3Brad King2016-06-221-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2016-06-220-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into releaseBrad King2016-06-211-1/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'update-libarchive' into releaseBrad King2016-06-2019-49/+88
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindZLIB-fixup'Brad King2016-06-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bb83514 FindZLIB: Do not mark unused variable as advanced
| * | | | | | | FindZLIB: Do not mark unused variable as advancedBrad King2016-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer define the ZLIB_LIBRARY cache entry, so we should not mark it as advanced either. We only use this variable when someone else defines it in order to remain compatible with older versions of this module, but we never create the entry ourselves anymore.
* | | | | | | | Merge topic 'GetPrerequisites-findstr'Brad King2016-06-221-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output
| * | | | | | | | GetPrerequisites: Optimize on Windows by filtering `objdump` outputLaurent Tarrisse2016-06-211-1/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the optimization from commit v3.4.0-rc1~264^2 (GetPrerequisites: Optionally filter "objdump" output for speed, 2015-07-29) to work on Windows by using `findstr` in place of `grep`.
* | | | | | | | Merge topic 'doc-VS_STARTUP_PROJECT-clarify'Brad King2016-06-221-1/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | d3e538ea Help: Clarify VS_STARTUP_PROJECT documentation
| * | | | | | | Help: Clarify VS_STARTUP_PROJECT documentationBrad King2016-06-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain in what directory the property should be set to affect the corresponding ``.sln`` file. Suggested-by: Stephen Kelly <steveire@gmail.com>
* | | | | | | | CMake Nightly Date StampKitware Robot2016-06-221-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2016-06-210-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'cpack-deb-test-fixes' into releaseBrad King2016-06-203-10/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pkgconfig-targets' into releaseBrad King2016-06-201-2/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindQt4-doc-QtDeclarative-imported' into releaseBrad King2016-06-201-0/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'output-converter'Brad King2016-06-214-48/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ddbd4c2 cmOutputConverter: remove unnecessary conversion bdaadbdc cmOutputConverter: collapse ConvertToOutputForExisting functions 191fc3a0 cmOutputConverter: remove unused 'local' argument b86007e3 cmOutputConverter: remove 'optional' argument cde127b0 cmOutputConverter::Convert: invert condition c23f89bc cmOutputConverter::Convert: make precondition explicit
| * | | | | | | | | | | cmOutputConverter: remove unnecessary conversionDaniel Pfeifer2016-06-201-6/+4
| | | | | | | | | | | |
| * | | | | | | | | | | cmOutputConverter: collapse ConvertToOutputForExisting functionsDaniel Pfeifer2016-06-202-22/+6
| | | | | | | | | | | |
| * | | | | | | | | | | cmOutputConverter: remove unused 'local' argumentDaniel Pfeifer2016-06-204-15/+8
| | | | | | | | | | | |
| * | | | | | | | | | | cmOutputConverter: remove 'optional' argumentDaniel Pfeifer2016-06-202-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the 'optional' paramenter from the second overload of the Convert function. This parameter is used from one single location. Inline the codepath for which the argument is true to the callsite.
| * | | | | | | | | | | cmOutputConverter::Convert: invert conditionDaniel Pfeifer2016-06-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the control flow of the 'optional' argument more explicit.
| * | | | | | | | | | | cmOutputConverter::Convert: make precondition explicitDaniel Pfeifer2016-06-201-2/+4
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'Brad King2016-06-211-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6509ad29 CTest: Properly set buildname if only C langage is enabled
| * | | | | | | | | | | CTest: Properly set buildname if only C langage is enabledJean-Christophe Fillion-Robin2016-06-201-6/+6
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14068
* | | | | | | | | | | Merge topic 'FindGLEW-debug'Brad King2016-06-211-9/+34
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6087b9e4 FindGLEW: Search for debug and release configurations separately
| * | | | | | | | | | | FindGLEW: Search for debug and release configurations separatelyFARBOS Arnaud2016-06-201-9/+34
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'FindLua-match-header-and-lib'Brad King2016-06-211-45/+72
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eecd307e FindLua: Iterate through all include subdirs to find a suitable header 3532cbce FindLua: Check header file against suitable versions 281c707b FindLua: Factor out a helper function for version extraction 92c67b9f FindLua: Prefix private APIs with `_lua_`
| * | | | | | | | | | | FindLua: Iterate through all include subdirs to find a suitable headerIvan Ivanov2016-06-201-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15756.
| * | | | | | | | | | | FindLua: Check header file against suitable versionsIvan Ivanov2016-06-201-5/+12
| | | | | | | | | | | |
| * | | | | | | | | | | FindLua: Factor out a helper function for version extractionIvan Ivanov2016-06-201-23/+30
| | | | | | | | | | | |
| * | | | | | | | | | | FindLua: Prefix private APIs with `_lua_`Ivan Ivanov2016-06-201-8/+8
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'update-libarchive'Brad King2016-06-2119-49/+88
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52f58267 Merge branch 'upstream-LibArchive' into update-libarchive 2b94d71d LibArchive 2016-06-19 (139d0576)