summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-xcode-quoting' into releaseBrad King2015-07-311-1/+1
|\
| * Xcode: Quote strings containing a tilde (#15672)Gregor Jasny2015-07-311-1/+1
| | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~183^2 (Xcode: Refine quoting rules for Strings, 2015-04-09) we no longer quote strings containing a period ('.'). However, file names like "icon29x29~ipad.png" still need quoting because they contain a tilde ('~'). Add tilde to our explicit list of characters that need quoting because such file names will no longer happen to be quoted because they contain a period.
* | ctest: fix add_subdirectory() crashBen Boeckel2015-07-271-1/+1
|/ | | | | | The directory is at args[0], not args[1]. Introduced in commit v2.6.0~489 (... 5889 ... tests are not found in some cases when using add_subdirectory ..., 2008-01-18).
* CMake 3.3.0v3.3.0Brad King2015-07-231-1/+1
|
* Revert "CMake 3.3.0"Brad King2015-07-221-1/+1
| | | | | | This reverts commit 0e3cfc134cee5b560a636d72231cfcaeac376b85. Due to VS 2015 RTM being released, additional changes are needed to CMake 3.3.
* CMake 3.3.0Brad King2015-07-201-1/+1
|
* CMake 3.3.0-rc4v3.3.0-rc4Brad King2015-07-131-1/+1
|
* Merge branch 'fix-command-rename' into releaseBrad King2015-07-131-0/+11
|\
| * cmState: Restore renamed commands on cleanup.Stephen Kelly2015-07-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | Commit v3.3.0-rc1~196^2~7 (cmake: Simplify command clean up loop., 2015-04-12) introduced a bug that built-in commands which were renamed no longer had their original name restored when cleanup is performed between configure runs. Check for that and restore the commands with their original name. Extend the complex test for this. That test is run by ctest with the --build-two-config command line option.
* | Merge branch 'cpack-ifw-framework-version' into releaseBrad King2015-07-081-2/+4
|\ \
| * | CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSIONKonstantin Podsvirov2015-07-081-2/+4
| | | | | | | | | | | | | | | | | | This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1 (CPackIFW: Add QtIFW 2.0 support, 2015-04-27). We need to load the CPackIFW module to initialize it if it is not set.
* | | Merge branch 'empty-LINK_LIBRARIES' into releaseBrad King2015-07-081-6/+12
|\ \ \ | |_|/ |/| |
| * | set_property: Fix crash when setting LINK_LIBRARIES to nothingBrad King2015-07-081-6/+12
| |/ | | | | | | | | | | | | | | We use a special dedicated structure to store the LINK_LIBRARIES target property. Do not try to construct a string from a NULL value. Instead leave the property structure empty when no value is given. Reported-by: Ghyslain Leclerc <ghleclerc@gmail.com>
* | Merge branch 'fortran-module-preprocessor-defs' into releaseBrad King2015-07-061-1/+1
|\ \
| * | Fortran: Fix passing of preprocessor definitions to dependency scannerBrad King2015-07-061-1/+1
| |/ | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~352^2~3 (Genex: Allow COMPILE_LANGUAGE when processing compile definitions, 2015-03-04) the name of the variable used to pass preprocessor definitions to the Fortran dependency scanner was changed to be per-language, but the actual dependency scanning code was not updated accordingly. Update the code and add a test case. Reported-by: Radovan Bast <radovan.bast@gmail.com>
* | CMake 3.3.0-rc3v3.3.0-rc3Brad King2015-06-261-1/+1
| |
* | Merge branch 'fix-target_link_libraries-wrong-dir' into releaseBrad King2015-06-253-4/+6
|\ \
| * | cmTarget: Fix diagnostic of target_link_libraries in wrong directory (#15626)Brad King2015-06-253-4/+6
| |/ | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~62^2~5 (cmTarget: Store only cmListFileContext for CMP0023 handling, 2015-05-18) a call to target_link_libraries on a target that was defined in another (non-ancestor) directory crashes because no execution context is left active. Fix this by getting the execution context from the actual cmMakefile where the current target_link_libraries call takes place. Test this by verifying that such calls correctly produce an error diagnostic instead of crashing.
* | Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-242-2/+2
|\ \
| * | cmake-gui: Change --install to use /usr/local/bin by default (#15627)Brad King2015-06-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~49^2~2 (cmake-gui: Add --install option to add command-line tools on OS X, 2015-05-19) the option default was set to /usr/bin because that is where the old command line install dialog placed the symlinks. A better default is /usr/local/bin because it is meant for locally installed software rather than Apple-installed tools. Also, as of OS X El Capitan, special privileges are required even for root to modify /usr/bin but not /usr/local/bin.
* | | Merge branch 'fix-function-missing-end' into releaseBrad King2015-06-226-27/+32
|\ \ \
| * | | Fix assertion failure on unmatched function or macroBrad King2015-06-226-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach in function, 2015-05-18) broke handling of unmatched non-loop blocks because it assumed all function blockers removed during error unwinding were for loops, essentially switching the set of mishandled cases. The purpose of the loop block push/pop operations is to define a scope matching the lifetime of the loop function blockers. Since our function blockers already have the proper lifetime, simply move the push/pop operations to their constructor/destructor. Extend the RunCMake.Syntax test with a case covering this.
* | | | CMake 3.3.0-rc2v3.3.0-rc2Brad King2015-06-091-1/+1
| | | |
* | | | Merge branch 'ctest-script-mode-no-legacy-cygwin' into releaseBrad King2015-06-081-0/+4
|\ \ \ \
| * | | | ctest: Disable CMake Cygwin legacy warning in dashboard client scriptBrad King2015-06-081-0/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | In ctest -S mode we load the CTestScriptMode module to give the configuration scripts access to the host system information. CYGWIN.cmake warns unless we explicitly tell it not to warn since there is no chance for a cmake_minimum_required(VERSION) to be called.
* | | | Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-081-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | cmake-gui: Make command-line install help text selectableClinton Stimpson2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | This will allow users to cut-n-paste the instructions over to a command prompt.
* | | | CMake 3.3.0-rc1 version updateBrad King2015-06-021-3/+3
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2015-06-021-1/+1
| | |
* | | Merge topic 'mingw32-make-backslash-workaround'Brad King2015-06-011-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 7dd4a12c Revert "Makefile: Fix compilation after parent commit was backported"
| * | | Revert "Makefile: Fix compilation after parent commit was backported"Brad King2015-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bfa57c5f80278abc044b7342e81e5aaad82bffab. This change should not be part of 'master', only in 'release' for CMake 3.2.
* | | | Merge branch 'release'Brad King2015-06-011-1/+0
|\ \ \ \
| * \ \ \ Merge branch 'mingw32-make-backslash-workaround' into releaseBrad King2015-06-011-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Makefile: Fix compilation after parent commit was backportedBrad King2015-06-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The CMake 3.2 release branch does not have 'cmAlgorithms.h' and simply provides 'cmHasLiteralSuffix' in 'cmStandardIncludes.h' instead.
| * | | | Merge branch 'ctest-update-gmake-error-match' into releaseBrad King2015-05-271-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-function-missing-endforeach' into releaseBrad King2015-05-182-1/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
* | | | | Merge topic 'file-log-less-data'Brad King2015-06-011-20/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eba12a43 cmFileCommand: Do not log raw protocol data from curl (#15589) 7e10f169 cmFileCommand: Clarify logic for populating LOG variable 0d37dcd3 cmFileCommand: Rename variable verboseLog => logVar 43c01e07 cmFileCommand: Remove leftover no-op debugging logic
| * | | | | cmFileCommand: Do not log raw protocol data from curl (#15589)Brad King2015-05-281-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmFileCommandCurlDebugCallback to filter the debug data by type and show only summary information instead of the raw data. This avoids allocating memory for all data transferred by UPLOAD or DOWNLOAD.
| * | | | | cmFileCommand: Clarify logic for populating LOG variableBrad King2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chunkDebug buffer we use to accumulate the LOG variable content is populated if and only if a log variable was requested by the call, but it is much clearer to check that a log variable was requested explicitly before populating it.
| * | | | | cmFileCommand: Rename variable verboseLog => logVarBrad King2015-05-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the LOG variable name consistent between UPLOAD and DOWNLOAD implementations.
| * | | | | cmFileCommand: Remove leftover no-op debugging logicBrad King2015-05-281-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove debugging logic left from commit v2.6.0~305 (add DOWNLOAD option to FILE command, 2008-02-06). The CURLE_OPERATION_TIMEOUTED code path does nothing that the code immediately after it does not do.
* | | | | | Merge topic 'update-kwsys'Brad King2015-06-013-14/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf365792 Merge branch 'upstream-kwsys' into update-kwsys ee71b751 KWSys 2015-05-27 (61e0419f)
| * | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-283-14/+51
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-06-011-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-311-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-301-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-291-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'ctest-xml-refactor'Brad King2015-05-2826-714/+919
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de2ef305 cmCTest: Drop unused method overloads b04500a7 cmCTest{Test,MemCheck}Handler: Port to cmXMLWriter 8fbc509a cmCTestCoverageHandler: Port to cmXMLWriter 82455a9d cmCTestBuildHandler: Port to cmXMLWriter 1dbd86fd cmCTestLaunch: Port to cmXMLWriter a53bd63e cmCTest: Port GenerateNotesFile to cmXMLWriter 9c0bb7d8 cmCTestConfigureHandler: Port to cmXMLWriter 6cf5cc71 cmCTestUploadHandler: Port to cmXMLWriter ed42c203 cmCTestUpdateHandler: Port to cmXMLWriter 18825baf cmCTest: Port to cmXMLWriter f6413400 Add cmXMLWriter class to consolidate XML generation
| * | | | | | cmCTest: Drop unused method overloadsDaniel Pfeifer2015-05-262-115/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The StartXML, EndXML, and AddSiteProperties overloads that take a stream directly are no longer called anywhere. All clients hvae been ported to cmXMLWriter. Drop the old overloads.
| * | | | | | cmCTest{Test,MemCheck}Handler: Port to cmXMLWriterDaniel Pfeifer2015-05-264-224/+202
| | | | | | |