summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-include_directories-whitespace-handling'Brad King2013-05-241-1/+4
|\ | | | | | | | | a97240b Tests/IncludeDirectories: Avoid shared library with no symbols
| * Tests/IncludeDirectories: Avoid shared library with no symbolsBrad King2013-05-231-1/+4
| | | | | | | | | | | | The parent commit added a empty_entry_test shared library to the IncludeDirectories test. Some toolchains fail to create a shared library with no user-defined symbols, so provide a dummy symbol.
* | Merge topic 'Memchecker-Mac-fix'Brad King2013-05-241-1/+1
|\ \ | | | | | | | | | | | | 0aed09f Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones
| * | Tests: ignore GuardMalloc messages on all Apple build, not just XCode onesRolf Eike Beer2013-05-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-05-241-1/+1
| | |
* | | Merge topic 'xcode-attributes-variant'Brad King2013-05-231-2/+33
|\ \ \ | | | | | | | | | | | | | | | | 332350b Xcode: Support XCODE_ATTRIBUTE_ with [variant=<config>] (#12532)
| * | | Xcode: Support XCODE_ATTRIBUTE_ with [variant=<config>] (#12532)Cédric OCHS2013-05-221-2/+33
| |/ / | | | | | | | | | | | | | | | | | | | | | Since commit c519bb2b (XCode: Also qoute [] as needed to set build-configurations, 2011-04-05) we escape "[]" conditions for XCODE_ATTRIBUTE_ settings. However, we need to handle the "variant" condition with a special case to map it only into the settings for the matching configuration.
* | | Merge topic 'xcode-shared-linker-flags-per-config'Brad King2013-05-231-17/+13
|\ \ \ | | | | | | | | | | | | | | | | bcda47d Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)
| * | | Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)Matthew Bentham2013-05-221-17/+13
| |/ / | | | | | | | | | | | | | | | Refactor lookup of CMAKE_(EXE|MODULE|SHARED)_LINKER_FLAGS(|_<CONFIG>) variables to ensure all combinations are handled. Use the helper method AddConfigVariableFlags to simplify the implementation.
* | | CMake Nightly Date StampKitware Robot2013-05-231-1/+1
| | |
* | | Merge topic 'join-genex'Brad King2013-05-227-51/+145
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7ba452 Add the JOIN generator expression. 96ec314 Make it possible for any genex to have arbitrary content at the end. bd638ee Rename the method determining if a genex accepts arbitrary content. dc742fe Extract the ProcessArbitraryContent method.
| * | | Add the JOIN generator expression.Stephen Kelly2013-05-166-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | This generator expression joins a list with a separator. The separator may contain arbitrary content, such as commas, which is ordinarily a delimiter in the generator expression syntax.
| * | | Make it possible for any genex to have arbitrary content at the end.Stephen Kelly2013-05-161-1/+14
| | | |
| * | | Rename the method determining if a genex accepts arbitrary content.Stephen Kelly2013-05-161-6/+8
| | | | | | | | | | | | | | | | | | | | The meaning of this will be expanded to generator expressions with more than a single parameter.
| * | | Extract the ProcessArbitraryContent method.Stephen Kelly2013-05-162-41/+62
| | | |
* | | | Merge topic 'LinkLine-typedef'Brad King2013-05-221-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 776225d cmTarget: drop the unused local typedef LinkLine
| * | | | cmTarget: drop the unused local typedef LinkLineRolf Eike Beer2013-05-221-2/+0
| | |/ / | |/| |
* | | | Merge topic 'wizard-cleanup'Brad King2013-05-221-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | eca523f wizard: simplify control flow f1d27bf wizard: fix warnings
| * | | | wizard: simplify control flowRolf Eike Beer2013-05-221-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking if a byte is 0 before checking it for something else doesn't do anything useful. Also one can be sure that it can't be anything wanted if the value was set to 0 immediately before.
| * | | | wizard: fix warningsRolf Eike Beer2013-05-211-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .../Source/cmakewizard.cxx: In member function ‘virtual void cmakewizard::AskUser(const char*, cmCacheManager::CacheIterator&)’: .../Source/cmakewizard.cxx:31:35: warning: conversion to ‘int’ from ‘long unsigned int’ may alter its value [-Wconversion] if(!fgets(buffer, sizeof(buffer)-1, stdin)) ^ .../Source/cmakewizard.cxx: In member function ‘virtual bool cmakewizard::AskAdvanced()’: .../Source/cmakewizard.cxx:70:35: warning: conversion to ‘int’ from ‘long unsigned int’ may alter its value [-Wconversion] if(!fgets(buffer, sizeof(buffer)-1, stdin)) The compiler is (partly) right here: sizeof() returns a size_t, which often is bigger as as int as it is unsigned long or something similar. Add an explicit cast to get rid of that warning here, the buffer has a size of 4KiB, so the value will fit into an int on all sane platforms.
* | | | Merge topic 'Memchecker-AIX-fix'Brad King2013-05-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1a2a6ba Tests: fix build of dummy memtester on AIX
| * | | | Tests: fix build of dummy memtester on AIXRolf Eike Beer2013-05-211-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Both <string> and <cmSystemTools.h> include <stdio.h> one or the other way. It looks like the CMake header adds a define that will cause another part of the system header to be used, resulting in conflicting definitions.
* | | | Merge topic 'ctest-parallel-env'Brad King2013-05-223-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | db43502 CTest: Read CTEST_PARALLEL_LEVEL from environment
| * | | | CTest: Read CTEST_PARALLEL_LEVEL from environmentStephen Kelly2013-05-213-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | If no explicit "-j <n>" option is given on the command line then read the parallel level from an environment variable.
* | | | | Merge topic 'string-MAKE_C_IDENTIFIER-subcommand'Brad King2013-05-223-1/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0ab50ae string: Add MAKE_C_IDENTIFIER subcommand
| * | | | | string: Add MAKE_C_IDENTIFIER subcommandStephen Kelly2013-05-213-1/+33
| | | | | |
* | | | | | Merge topic 'add-EXPORT_NAME-property'Brad King2013-05-2214-17/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5d6f5d Add EXPORT_NAME property.
| * | | | | | Add EXPORT_NAME property.Stephen Kelly2013-05-1814-17/+122
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for example, the buildsystem to use names like 'boost_any' instead of the overly generic 'any', and still be able to generate IMPORTED targets called 'boost::any'.
* | | | | | CMake Nightly Date StampKitware Robot2013-05-221-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'fix-include_directories-whitespace-handling'Brad King2013-05-213-2/+25
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 2f84dfe include_directories: Fix handling of empty or space-only entries
| * | | | include_directories: Fix handling of empty or space-only entriesStephen Kelly2013-05-213-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression introduced in commit 0d46e9a0 (Store includes from the same include_directories call together., 2013-01-20). Reported at http://thread.gmane.org/gmane.comp.programming.tools.cmake.user/46695/focus=7847
* | | | | Merge topic 'fix-genex-comma-parse'Brad King2013-05-213-5/+24
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 05bf972 Fix handling of commas in arbitrary content in genexes.
| * | | | Fix handling of commas in arbitrary content in genexes.Stephen Kelly2013-05-163-5/+24
| | |_|/ | |/| | | | | | | | | | | | | | As the comma is the parameter separator, it needs to be re-added when evaluating to reconstruct arbitrary content.
* | | | Merge topic 'unused-cleanup'Brad King2013-05-213-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 994dc70 Remove unused vector population. 44258cc Remove unused typedef. 0a4d7d8 Remove unused marker for a variable which is now used.
| * | | | Remove unused vector population.Stephen Kelly2013-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | The call to GetEnabledLanguages does not have side-effects.
| * | | | Remove unused typedef.Stephen Kelly2013-05-171-1/+0
| | | | |
| * | | | Remove unused marker for a variable which is now used.Stephen Kelly2013-05-161-1/+0
| |/ / /
* | | | Merge topic 'vs-asm-listing-location'Brad King2013-05-212-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7e0c45e VS: Allow /Fa to set AssemblerListingLocation (#14153)
| * | | | VS: Allow /Fa to set AssemblerListingLocation (#14153)Brad King2013-05-202-4/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the default AssemblerListingLocation through the flag map so that it can be overridden by a user /Fa flag. Also teach the VS 7-9 generators to map /Fa to AssemblerListingLocation. While at it, fix the AssemblerListingLocation default value to have a trailing slash after the configuration name. This ensures it will be treated as a directory and not a file name.
* | | | Merge topic 'fix-style'Brad King2013-05-213-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 3c7c332 Fix brace indentation. c70b9b5 Fix style.
| * | | | Fix brace indentation.Stephen Kelly2013-05-181-2/+2
| | | | |
| * | | | Fix style.Stephen Kelly2013-05-162-2/+2
| | |/ / | |/| |
* | | | Merge topic 'implicit-link-sanitize-regex'Brad King2013-05-212-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ffda082 Sanitize linker name to parse implicit link line (#14154)
| * | | | Sanitize linker name to parse implicit link line (#14154)Brad King2013-05-172-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMakeParseImplicitLinkInfo to convert the CMAKE_LINKER file name to a regular expression that matches only the original name. Escape special characters like '+' so they are not treated as regex syntax. Extend the ImplicitLinkInfoTest to test handling of a CMAKE_LINKER value with many special characters.
* | | | Merge topic 'error-on-exported-missing-include-dir'Brad King2013-05-218-3/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | eabefa8 Error on relative path in INCLUDE_DIRECTORIES target property.
| * | | | Error on relative path in INCLUDE_DIRECTORIES target property.Stephen Kelly2013-05-218-3/+69
| | |/ / | |/| | | | | | | | | | | | | | Add policy CMP0021 to preserve existing behavior in projects expecting it from earlier CMake versions.
* | | | Merge topic 'fix-build-without-qt4-with-qt5'Brad King2013-05-211-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
| * | | | FindQt4: Fix QUIET failure with Qt 5 but not Qt 4Stephen Kelly2013-05-211-0/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The call find_package(Qt4 QUIET) should be non-FATAL in that case. This fixes #14142.
* | | | Merge topic 'shared-libs-with-number-suffix'Brad King2013-05-212-5/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 342fc04 Recognize shared library files with a numerical suffix
| * | | | Recognize shared library files with a numerical suffixStephen Kelly2013-05-212-5/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | When processing link line entries we check for matches with known naming patterns for static and shared libraries. Teach this logic to recognize numerical suffixes after shared library names such as "libfoo.so.1".
generated by cgit v0.12 at 2025-02-02 22:50:45 (GMT)