summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Create parser for Visual Studio .sln filesPetr Kmoch2013-04-1224-0/+1900
| | | | | | Create class cmVisualStudioSlnParser as a generic parser for Visual Studio .sln files. Implement minimum functionality but keep class extensible. Add tests for the class.
* Add projectDir parameter to GenerateBuildCommandPetr Kmoch2013-04-1217-21/+41
| | | | | | | | Extend the cmGlobalGenerator::GenerateBuildCommand virtual method signature with a "projectDir" parameter specifying the top of the project build tree for which the build command will be generated. Populate it from call sites in cmGlobalGenerator::Build where a fully-generated build tree should be available.
* cmSystemTools: Generalize TrimWhitespace to all whitespacePetr Kmoch2013-03-271-2/+2
| | | | | Modify cmSystemTools::TrimWhitespace() to remove all leading and trailing whitespace, not just spaces.
* Merge topic 'error-on-exported-missing-include-dir'Brad King2013-03-2620-9/+241
|\ | | | | | | | | | | 28051f1 Report an error on IMPORTED targets with a faulty INTERFACE af81a3c install(EXPORT): Ensure clean INTERFACE_INCLUDE_DIRECTORIES
| * Report an error on IMPORTED targets with a faulty INTERFACEStephen Kelly2013-03-266-5/+52
| | | | | | | | | | | | | | | | | | | | It is considered an error if the INTERFACE_INCLUDE_DIRECTORIES contains a directory which does not exist, which indicates a programmer error by the upstream, or a packaging error. One of the RunCMake.CompatibleInterface tests also needs to be updated due to this change. Non-existant includes were used in the test, but are not needed.
| * install(EXPORT): Ensure clean INTERFACE_INCLUDE_DIRECTORIESStephen Kelly2013-03-2615-4/+189
| | | | | | | | | | | | | | | | | | | | Check that source and binary directories are not part of the INTERFACE_INCLUDE_DIRECTORIES for installed IMPORTED targets. This is limited to directories which do not contain generator expressions to evaluate. Such paths can only be checked at time of use of the imported target, which will be done in a follow up patch.
* | Merge topic 'ep_retry_clone'Brad King2013-03-261-5/+15
|\ \ | | | | | | | | | | | | 118f741 ExternalProject: Retry on a failed git clone
| * | ExternalProject: Retry on a failed git cloneBill Hoffman2013-03-261-5/+15
| | | | | | | | | | | | | | | Git sometimes fails to clone repositories due to network outage or server load. Try 3 times before giving up.
* | | Merge topic 'vs-sln-header'Brad King2013-03-262-2/+16
|\ \ \ | | | | | | | | | | | | | | | | c677838 VS: Fix VS 10/11 .sln headers (#14038)
| * | | VS: Fix VS 10/11 .sln headers (#14038)Brad King2013-03-252-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS version we generate in the .sln header is used by VS when opening the file through Windows Explorer and possibly elsewhere. Fix our generators to use version strings known to VS to avoid a drop-down box. For VS 10, since commit 4f96af44 (Fix VS 10 .sln files for Windows Explorer, 2009-10-22) we use "Visual Studio 2010" instead of just "Visual Studio 10". This is correct except that for the Express edition we need "Visual C++ Express 2010". For VS 11, since commit f0d66ab4 (VS11: Fix comment generated at the top of *.sln files, 2011-10-20) we use "Visual Studio 11" in the .sln header but the preferred value is "Visual Studio 2012" (just as the first commit mentioned above fixed for VS 10). Also for the Express edition we need "Visual Studio Express 2012 for Windows Desktop".
* | | | Merge topic 'fix-new-target-commands-docs'Brad King2013-03-262-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2e80f9f Fix new target commands documentation.
| * | | | Fix new target commands documentation.Stephen Kelly2013-03-252-7/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target_include_directories and target_compile_defintions commands accepted targets as arguments until commit f6b16d4b (Don't allow targets args in the new target commands., 2013-01-29). This followed from discussion on the mailing list (target_include_directories() accepts only absolute paths ?, 2013-01-28): http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/5925/focus=5948 http://public.kitware.com/pipermail/cmake-developers/2013-January/006301.html It was also decided to allow relative paths in target_include_directories().
* | | | Merge topic 'fix-COMPILE_DEFINITIONS-config'Brad King2013-03-2618-42/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1703b00 Test evaluation of per-config COMPILE_DEFINITIONS (#14037) a6286e9 Fix the evaluation of per-config COMPILE_DEFINITIONS (#14037)
| * | | | Test evaluation of per-config COMPILE_DEFINITIONS (#14037)Brad King2013-03-256-3/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Teach the CompileDefinitions test to cover evaluation of config-specific generator expressions.
| * | | | Fix the evaluation of per-config COMPILE_DEFINITIONS (#14037)Stephen Kelly2013-03-2512-39/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API for retrieving per-config COMPILE_DEFINITIONS has long existed because of the COMPILE_DEFINITIONS_<CONFIG> style properties. Ensure that the provided configuration being generated is also used to evaluate the generator expressions in cmTarget::GetCompileDefinitions. Both the generic COMPILE_DEFINITIONS and the config-specific variant need to be evaluated with the requested configuration. This has the side-effect that the COMPILE_DEFINITIONS does not need to be additionally evaluated with no configuration, so the callers can be cleaned up a bit too.
* | | | | CMake Nightly Date StampKitware Robot2013-03-261-1/+1
| |/ / / |/| | |
* | | | Merge topic 'compile-object-TARGET-placeholder'Brad King2013-03-251-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0b7ad3f Replace <TARGET> in CMAKE_<LANG>_COMPILE_OBJECT rule variables
| * | | | Replace <TARGET> in CMAKE_<LANG>_COMPILE_OBJECT rule variablesBrad King2013-03-221-0/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some languages the compiler may need to know the path of the final target file for which an object is being compiled. Honor the <TARGET> placeholder for compilation rules to support such cases. Note that this cannot work with OBJECT library targets because the final target path is not known during compilation (there can even be more than one final target). Suggested-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | | Merge topic 'rename-include-current-dir-in-interface-var'Brad King2013-03-258-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fc43477 Rename variable for including current directory in interfaces
| * | | | Rename variable for including current directory in interfacesBrad King2013-03-198-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the variable added by commit 9ce1b9ef (Add CMAKE_BUILD_INTERFACE_INCLUDES build-variable, 2012-11-25) to CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE to be more consistent with the existing CMAKE_INCLUDE_CURRENT_DIR variable. Suggested-by: Alex Neundorf <neundorf@kde.org>
* | | | | Merge topic 'update-kwsys'Brad King2013-03-252-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ed2d03 Merge branch 'upstream-kwsys' into update-kwsys 83a9f09 KWSys 2013-03-21 (2d263bc3)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-03-222-1/+7
| |\ \ \ \ \
| | * | | | | KWSys 2013-03-21 (2d263bc3)KWSys Robot2013-03-222-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 2d263bc3 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 5c34ed2e..2d263bc3 Paul Kunysch (1): 2d263bc3 Process: Increase FD_SETSIZE on Cygwin Sean McBride (1): 13f5badd SystemInformation: Replace __GNUG__ with __GNUC__ Change-Id: I2d29f6d7e9bbc34f7a9b40394a7ee05f3c537396
* | | | | | | Merge topic 'cpack-printf-format-warnings'Brad King2013-03-251-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fca154 CPack: Avoid "format expects 'unsigned int'" warnings
| * | | | | | | CPack: Avoid "format expects 'unsigned int'" warningsPaul Kunysch2013-03-221-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cast sprintf uid and gid arguments to match the type expected by their "%-6u" format strings.
* | | | | | | Merge topic 'doc-string-regex'Brad King2013-03-251-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 763a6dc string: Fix regex documentation of '^' and '$' (#14028)
| * | | | | | string: Fix regex documentation of '^' and '$' (#14028)Brad King2013-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They match at the beginning and end of the input, not by line. Reported-by: Martin Perzl <martin.perzl@web.de>
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-251-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-241-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-231-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-03-221-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-03-211-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-03-201-1/+1
| | | |
* | | | Merge topic 'automoc-append-implicit-dirs'Brad King2013-03-191-13/+24
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 753b905 Automoc: append implicit includes after user-specified dirs
| * | | Automoc: append implicit includes after user-specified dirsStephen Kelly2013-03-191-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit d2536579 (Automoc: fix regression #13667, broken build in phonon, 2012-11-19) changed Automoc to try to re-add the Qt header dir if it was stripped out as an implicit include from the moc command line. When invoking a compiler, those directories are stripped out because they are built-in, but for moc, there are no built-in directories. The follow-up commit acc22400 (Automoc: get include dirs without stripping implicit include dirs off, 2012-12-07) went further by not removing the implicit include dirs, if they were specified specifically by the user. This had the remaining problem that the implicit include dirs appeared in a different order of precedence for moc compared to the compiler. Resolve that by stripping out the include dirs, where specified for the moc command line to, and then appending them at the end. Note that the order of the appended implicit include directories is the order they are specified in the CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES, not the order specified by the user.
* | | | Merge topic 'expand-version-of-Qt5-gui-fix'Brad King2013-03-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
| * | | | cmake-gui: Use the QStandardItemModel workaround until 5.1.0.Stephen Kelly2013-03-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a Qt 5.0.3 release, it may or may not contain the patch that fixes this issue. http://thread.gmane.org/gmane.comp.lib.qt.releasing/882 Just use the workaround until 5.1.0 which certainly will contain the fix. Don't use the workaround before Qt 5.0.0.
* | | | Merge topic 'FindImageMagick-v6.8.0-8'Brad King2013-03-191-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dbd895b FindImageMagick: Search versioned suffixes (#14012)
| * | | | FindImageMagick: Search versioned suffixes (#14012)Rex Dieter2013-03-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added suffixes for -Q8 and -Q16 but there may also be versioned suffixes -6.Q8 and -6.Q16.
* | | | | Merge topic 'Ruby-version-selection'Brad King2013-03-191-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d7e05e4 FindRuby: improve version selection
| * | | | | FindRuby: improve version selectionRolf Eike Beer2013-03-181-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will stop e.g. looking for a ruby1.9 executable first if "1.8 EXACT" was given.
* | | | | | Merge topic 'fix-genex-preprocess'Brad King2013-03-192-2/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a619fa Fix cmGeneratorExpression::Preprocess for interleaved inputs.
| * | | | | | Fix cmGeneratorExpression::Preprocess for interleaved inputs.Stephen Kelly2013-03-182-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't find both preprocessing expressions at once, because then the BUILD_INTERFACE will always be favored if both are present, even if INSTALL_INTERFACE appears first. This was affecting the behavior of install(EXPORT) because the INTERFACE_INCLUDE_DIRECTORIES contained entries like /foo/include;$<INSTALL_INTERFACE:/bar/include> As the INSTALL_INTERFACE always evaluates to '0', it always needs to be preprocessed properly.
* | | | | | | Merge topic 'fix-java-jar-depends'Brad King2013-03-191-12/+23
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adeafad UseJava.cmake: accept jar targets in add_jar 53a05b8 UseJava.cmake: fix passing jars to add_jar 45c8e4b UseJava.cmake: simplify path logic
| * | | | | | UseJava.cmake: accept jar targets in add_jarMatthew Woehlke2013-03-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify add_jar to also accepts jars by target name.
| * | | | | | UseJava.cmake: fix passing jars to add_jarMatthew Woehlke2013-03-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting classpath when encountering a jar argument to add_jar to actually set the variable that is used to specify the classpath to javac, instead of just uselessly appending the jar to CMAKE_JAVA_INCLUDE_PATH (which is never used again at the point where it is modified). Also, list jars so specified as dependencies of compiling the java sources for the jar target.
| * | | | | | UseJava.cmake: simplify path logicMatthew Woehlke2013-03-131-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move logic to determine relative path to .java file to after the file extension check, so that it only executes when it is actually used.
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-191-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'findqt4-withqt5'Brad King2013-03-181-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
| * | | | | | FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.Clinton Stimpson2013-03-181-0/+7
| | | | | | |
generated by cgit v0.12 at 2025-02-03 15:02:13 (GMT)