summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ / / |/| | |
* | | | Merge branch 'release'Brad King2016-02-090-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'fix-install-EXPORT-crash' into releaseBrad King2016-02-088-6/+19
| |\ \ \
| * \ \ \ Merge branch 'test-ctest_submit-update' into releaseBrad King2016-02-084-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'install-man-conditionally' into releaseBrad King2016-02-081-0/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-doc-typos' into releaseBrad King2016-02-082-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ExternalProject-build-config-compat' into releaseBrad King2016-02-081-2/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-Fortran-module-in-subdir' into releaseBrad King2016-02-086-5/+9
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'Brad King2016-02-092-1/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode
| * | | | | | | | | | FindCUDA: Only warn about non-existent dependency files in verbose modeJames Bigler2016-02-082-1/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'fix-target-lookup-performance-regression'Brad King2016-02-094-62/+47
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b7d5871 Improve internal generator target structure lookup 6cbf6a51 Fix internal target lookup performance regression
| * | | | | | | | | | Improve internal generator target structure lookupBrad King2016-02-083-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~272^2~6 (cmGlobalGenerator: Add FindGeneratorTarget API, 2015-10-25) a lookup was implemented via linear search. Replace it with an efficient data structure. Suggested-by: Stephen Kelly <steveire@gmail.com>
| * | | | | | | | | | Fix internal target lookup performance regressionBrad King2016-02-083-34/+32
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~272^2~13 (cmGlobalGenerator: Remove direct storage of targets, 2015-10-25) replaced an efficient data structure mapping from target name to cmTarget instance with a linear search. Lookups through cmGlobalGenerator::FindTarget are done a lot. Restore the efficient mapping structure with a name indicating its purpose. Reported-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
* | | | | | | | | | Merge topic 'install-man-conditionally'Brad King2016-02-091-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)
| * | | | | | | | | Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)Brad King2016-02-081-0/+8
| |/ / / / / / / /
* | | | | | | | | Merge topic 'apple-isystem-gcc'Brad King2016-02-093-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b04aa31 Xcode: Disable test for system include dirs 2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953)