summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Extend TIMESTAMP sub-commands with new unix time format specifierJose-Luis Blanco-Claraco2016-02-186-9/+101
| | | | | | | | The new `%s` format specifier is substituted by file()/string() `TIMESTAMP` sub-commands with the number of seconds since unix-epoch (1970-01-01 00:00:00 UTC). Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
* Merge branch 'release'Brad King2016-02-160-0/+0
|\
| * Merge branch 'fix-cmake_parse_arguments-expansion' into releaseBrad King2016-02-122-2/+29
| |\
| * \ Merge branch 'cmake-gui-reset-generator' into releaseBrad King2016-02-121-0/+7
| |\ \
| * \ \ Merge branch 'doc-xcode-escaping-fix' into releaseBrad King2016-02-111-0/+6
| |\ \ \
* | \ \ \ Merge topic 'cmake-gui-reset-generator'Brad King2016-02-161-0/+7
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959)
| * | | | cmake-gui: Fix cmState initialization when changing generators (#15959)Brad King2016-02-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.3.0-rc1~29^2~1 (cmState: Host some state from the cmGlobalGenerator, 2015-05-24) moved storage of some generator traits over to cmState. However, it accidentally removed initialization of the values from the cmGlobalGenerator constructor. This is needed because generator subclasses update the settings in their constructors. Since a single cmState instance is shared across multiple build trees by cmake-gui, initializing the values in its constructor is not enough. Fix this by restoring the needed initializations to the cmGlobalGenerator constructor.
* | | | | Merge topic 'fix-cmake_parse_arguments-expansion'Brad King2016-02-162-2/+29
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | c8c45a2c cmake_parse_arguments: Restore ;-list argument flattening
| * | | | cmake_parse_arguments: Restore ;-list argument flatteningDimitar Yordanov2016-02-122-2/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The re-implementation in commit v3.5.0-rc1~116^2~1 (CMakeParseArguments: replace by native cmake_parse_arguments command, 2015-12-05) introduced a regression when parsing the ARGN arguments with cmake_parse_arguments. The original implementation used foreach(currentArg ${ARGN}) to iterate over input arguments. This flattened ;-lists within the arguments whether they were quoted or not. Fix our new implementation to preserve this behavior and add a test case to cover it. Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com> Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>
* | | | Merge topic 'cpack-rpm-upper-cased-components'Brad King2016-02-1612-206/+248
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7c7efd1e CPack/RPM support for upper cased component variables
| * | | | CPack/RPM support for upper cased component variablesDomen Vrankar2016-02-1312-206/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_* variables expect component name in upper case. CPACK_RPM_* variables expected component name to be in same case as component name. This patch adds support for CPACK_RPM_* variables with upper case component names to match the convention with CPACK_* variables and also preserves same case component names for back compatibility.
* | | | | Merge topic 'fix-export-header-test'Brad King2016-02-162-9/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 326ad994 Tests: fix GenerateExportHeader directory definitions
| * | | | | Tests: fix GenerateExportHeader directory definitionsBen Boeckel2016-02-122-9/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to stringify the values, but instead just pass in strings. The core problem is that the path may have tokens which are replaced by the preprocessor which causes an invalid path to be used.
* | | | | Merge topic 'ninja-deterministic-gen'Brad King2016-02-161-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 46fa9583 Ninja: Fix non-determinism in generated target dependency order (#15968)
| * | | | | Ninja: Fix non-determinism in generated target dependency order (#15968)Brad King2016-02-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We represent target dependency sets as `set<cmTargetDepend>` which orders by a `cmGeneratorTarget const*` pointer value. Therefore the order of dependencies encountered in AppendTargetDepends is not predictable. Sort them by content to make the result deterministic.
* | | | | | CMake Nightly Date StampKitware Robot2016-02-161-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-02-151-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-02-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-02-131-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'BundleUtilities-dylib-in-framework'Brad King2016-02-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e422f738 BundleUtilities: Fix treatment of .dylib inside .framework folders
| * | | | | BundleUtilities: Fix treatment of .dylib inside .framework foldersChristian Askeland2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specific cause is when e.g. /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgio-2.0.0.dylib is detected by fixup_bundle. set_bundle_key_values() interprets this as a framework, thus doing a string replace that creates an embedded_item that is equal to the original path, i.e. it is not embedded.
* | | | | | Merge topic 'FindProtobuf-select-library-config'Brad King2016-02-121-22/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51b0501a FindProtobuf: prevent redundant PROTOBUF_LIBRARIES
| * | | | | | FindProtobuf: prevent redundant PROTOBUF_LIBRARIESAntonio Perez Barrero2016-02-111-22/+23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, the variable PROTOBUF_LIBRARIES might get redundant value for debug and optimized configurations, e.g. `optimized;/usr/lib/libprotobuf.so;debug;/usr/lib/libprotobuf.so`.
* | | | | | Merge topic 'fix-warnings'Brad King2016-02-121-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1ea1df0 cmListFileCache: Fix warning about inconsistent use of class/struct
| * | | | | | cmListFileCache: Fix warning about inconsistent use of class/structTobias Hunger2016-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposed by Clang trunk.
* | | | | | | CMake Nightly Date StampKitware Robot2016-02-121-1/+1
|/ / / / / /
* | | | | | Merge topic 'doc-xcode-escaping-fix'Brad King2016-02-111-0/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 878632c9 Help: Add release note about Xcode escaping fix (#15969)
| * | | | | Help: Add release note about Xcode escaping fix (#15969)Brad King2016-02-111-0/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.5.0-rc1~84^2 (Xcode: Escape all backslashes in strings, 2015-12-27) is a change in behavior that can break existing projects that worked around the inconsistency with other generators. Add a release note to call attention to this change in behavior.
* | | | | Merge topic 'ninja-deterministic-gen'Brad King2016-02-112-3/+15
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | 59ade844 Ninja: Fix non-determinism in generated build statement order (#15968)
| * | | | Ninja: Fix non-determinism in generated build statement order (#15968)Brad King2016-02-112-3/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | Generate custom command build statements in the order we encounter source files specifying them. Do not depend on pointer values of internally allocated structures for ordering.
* | | | Merge topic 'doc-FortranCInterface-variables'Brad King2016-02-111-126/+187
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f3f75a2 FortranCInterface: Document mangling result variables publicly 47f24cbc FortranCInterface: Improve documentation formatting and organization 9d1f40cc FortranCInterface: Convert docs to a bracket comment
| * | | | FortranCInterface: Document mangling result variables publiclyBrad King2016-02-101-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some projects may want to use the detailed mangling information directly instead of using the FortranCInterface_HEADER function. We already provide variables encoding the mangling information, so just document them as available.
| * | | | FortranCInterface: Improve documentation formatting and organizationBrad King2016-02-101-70/+78
| | | | | | | | | | | | | | | | | | | | | | | | | Organize content into sections. Define functions via explicit markup blocks so we can cross-reference them.
| * | | | FortranCInterface: Convert docs to a bracket commentBrad King2016-02-101-126/+127
| | | | | | | | | | | | | | | | | | | | | | | | | Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier.
* | | | | Merge topic 'cross_subproject_coverage'Brad King2016-02-111-17/+47
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 062045b8 More options for CTestCoverageCollectGCOV
| * | | | More options for CTestCoverageCollectGCOVZack Galbreath2016-02-101-17/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces two new options to CTestCoverageCollectGCOV. When GLOB is set we recursively search in the source & binary directories for .gcda files. Otherwise the default behavior is to parse TargetDirectories.txt for a list of locations to search. When DELETE is set we remove any .gcda file found after it has been used to generate the corresponding .gcov file. The .gcov file is also removed after the result tarball has been created. Together these two new features help support the use case of computing coverage across subprojects.
* | | | CMake Nightly Date StampKitware Robot2016-02-111-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-02-100-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | CMake 3.5.0-rc2v3.5.0-rc2Brad King2016-02-101-1/+1
| | |
* | | Merge branch 'release'Brad King2016-02-100-0/+0
|\ \ \ | |/ /
| * | Merge branch 'curl-pre-7.21.5' into releaseBrad King2016-02-091-0/+5
| |\ \
| * \ \ Merge branch 'wix-prevent-nsis-overwrite' into releaseBrad King2016-02-0910-4/+151
| |\ \ \
| * \ \ \ Merge branch 'fix-target-lookup-performance-regression' into releaseBrad King2016-02-084-62/+47
| |\ \ \ \
* | \ \ \ \ Merge topic 'update-prebuilt-openssl'Brad King2016-02-102-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0a1605b Utilities/Release: Update to openssl-1.0.2f
| * | | | | | Utilities/Release: Update to openssl-1.0.2fBrad King2016-02-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | | Merge topic 'wix-prevent-nsis-overwrite'Brad King2016-02-1010-4/+151
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | a12b0f1b CMake: Prevent WiX installations over existing NSIS installations
| * | | | | | CMake: Prevent WiX installations over existing NSIS installationsNils Gladitz2016-02-0910-4/+151
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom action to look for Uninstall.exe in the user selected installation prefix. Its presence indicates a previous NSIS installation. Inform the user and request manual resolution of the issue.
* | | | | | Merge topic 'curl-pre-7.21.5'Brad King2016-02-101-0/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.5
| * | | | | cmCurl: Fix compilation with system curl versions prior to 7.21.5Brad King2016-02-091-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version introduced CURLE_NOT_BUILT_IN which we have used since commit v3.4.0-rc1~211^2~4 (cmCurl: Tolerate lack of CURLOPT_CAPATH support, 2015-08-12). For older versions, just define the name to the then-unused error code so that we can compile.
* | | | | CMake Nightly Date StampKitware Robot2016-02-101-1/+1
| |/ / / |/| | |
generated by cgit v0.12 at 2025-09-07 14:53:43 (GMT)