summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for NinjaGregor Jasny2015-02-2617-22/+35
| | | | | | | | | The Ninja build system does not support a in-file verbositiy switch. Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE setting and pass it as an optional '-v' argument to Ninja. This can serve as a reasonable fallback. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* Merge topic 'windows-rc-enable-later'Brad King2015-02-264-9/+10
|\ | | | | | | | | | | | | 772eae44 RC: Add platform-specific preprocessor definitions (#15404) 4300de3e RC: Enable language after C, CXX, or Fortran is enabled (#15404) 1de4a0fb RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
| * RC: Add platform-specific preprocessor definitions (#15404)Brad King2015-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | In Platform/Windows-MSVC the C and CXX flags are initialized to contain preprocessor definitions describing the platform. On WinCE platforms this may not be just -DWIN32. This information may be important to RC sources too, so add such preprocessor definitions to the default RC flags. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
| * RC: Enable language after C, CXX, or Fortran is enabled (#15404)Brad King2015-02-253-6/+6
| | | | | | | | | | | | | | | | The RC language is special in that it is automatically enabled on Windows-based platforms when another primary language is enabled. Move enablement of RC from early in the enablement of the other language to late. This will allow it to use information detected as part of enabling C, CXX, or Fortran.
| * RC: Drop unused CMAKE_COMPILE_RESOURCE variable settingBrad King2015-02-252-3/+0
| | | | | | | | | | This variable has long been replaced by CMAKE_RC_COMPILE_OBJECT. Stop setting it in platform modules.
* | Merge topic 'ExternalData-url-algo-map'Brad King2015-02-2615-1/+96
|\ \ | | | | | | | | | | | | f7f4ca55 ExternalData: Add support for custom algorithm-to-URL mapping
| * | ExternalData: Add support for custom algorithm-to-URL mappingBrad King2015-02-2515-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow URL templates to contain a %(algo:<key>) placeholder that is replaced by mapping the canonical hash algorithm name through a map defined by the <key>. Extend the Module.ExternalData test to cover the behavior. Extend the RunCMake.ExternalData test to cover error cases.
* | | CMake Nightly Date StampKitware Robot2015-02-261-1/+1
| | |
* | | Merge branch 'release'Brad King2015-02-250-0/+0
|\ \ \
| * \ \ Merge branch 'sln-no-bom' into releaseBrad King2015-02-242-10/+0
| |\ \ \
* | \ \ \ Merge topic 'test-drop-CTestTestFailedSubmit'Brad King2015-02-252-91/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b10310e6 Tests: Drop CTestTestFailedSubmit-* tests
| * | | | | Tests: Drop CTestTestFailedSubmit-* testsBrad King2015-02-242-91/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Everything they cover is now covered by RunCMake.ctest_submit test cases (except ctest_coverage LABELS which were not actually checked anyway). Drop these redundant tests.
* | | | | Merge topic 'CheckCompilerFlag-use-FLAGS'Brad King2015-02-253-12/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5d5067ae Check*CompilerFlag: Refactor method used to pass flags
| * | | | | Check*CompilerFlag: Refactor method used to pass flagsMark Abraham2015-02-243-12/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Check*CompilerFlag modules to pass the flags to Check*SourceCompiles using CMAKE_REQUIRED_FLAGS instead of CMAKE_REQUIRED_DEFINITIONS. Both end up being used, but the variable for "FLAGS" is more precise.
* | | | | Merge topic 'vs-midl-absolute-OutputDirectory'Brad King2015-02-251-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4ee9005d cmVisualStudio10TargetGenerator: Wrap long line
| * | | | | cmVisualStudio10TargetGenerator: Wrap long lineBrad King2015-02-241-1/+2
| | | | | |
* | | | | | Merge topic 'refine-MSVC-ARM-WinCE'Brad King2015-02-253-14/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d612c73 MSVC: Compile with arch-specific flags on ARM platforms (#14552) 886dcaa7 MSVC: Distinguish among ARM architectures more precisely (#14552) ea986676 MSVC: Define /DWINCE when building for WinCE platforms (#14552)
| * | | | | | MSVC: Compile with arch-specific flags on ARM platforms (#14552)Gunnar Roth2015-02-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the exact ARM architecture name as a preprocessor symbol. Compile with /QRarch4T or /QRarch5T on ARMV4I or ARMV5I.
| * | | | | | MSVC: Distinguish among ARM architectures more precisely (#14552)Gunnar Roth2015-02-243-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect the exact ARM architecture instead of just "ARM". Treat "ARM" as an architecture family that includes THUMB (ARMV4I and ARMV5I).
| * | | | | | MSVC: Define /DWINCE when building for WinCE platforms (#14552)Gunnar Roth2015-02-241-1/+1
| | | | | | |
* | | | | | | Merge topic 'sln-no-bom'Brad King2015-02-252-10/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | | 987d4a12 VS: Do not generate a BOM in .sln files
| * | | | | VS: Do not generate a BOM in .sln filesBrad King2015-02-242-10/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.2.0-rc1~165^2 (Encoding: Write Visual Studio solution file with BOM, 2014-12-26). The BOM breaks the VS IDE version selector when loading the .sln from Windows Explorer.
* | | | | CMake Nightly Date StampKitware Robot2015-02-251-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cleanup-cmAlgorithms'Brad King2015-02-241-24/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47c2da6a cmAlgorithms: Cache the end iterators in algorithms. a5b10ae6 cmAlgorithms: Remove needless assignment. 7fd8557f cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices. 1f796791 cmAlgorithms: Relax iterator requirement for cmRemoveIndices. ba959934 cmAlgorithms: Make cmRemoveDuplicates work with more containers. cae45df7 cmAlgorithms: Rename template argument to RemoveN. b917f4c0 cmAlgorithms: Relax cmRemoveN requirement to FwdIter. bbc1a978 cmAlgorithms: Add a size() to cmRange. 47a3e22e cmAlgorithms: Rename template type in cmDeleteAll algorithm. cb75eec0 cmAlgorithms: Add const to const objects.
| * | | | cmAlgorithms: Cache the end iterators in algorithms.Stephen Kelly2015-02-241-4/+7
| | | | |
| * | | | cmAlgorithms: Remove needless assignment.Stephen Kelly2015-02-241-2/+1
| | | | |
| * | | | cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.Stephen Kelly2015-02-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid the algorithm of 'Schlemiel the painter' in the case of iterators which are not RandomAccess.
| * | | | cmAlgorithms: Relax iterator requirement for cmRemoveIndices.Stephen Kelly2015-02-241-2/+5
| | | | | | | | | | | | | | | | | | | | Require only forward iterators from the range.
| * | | | cmAlgorithms: Make cmRemoveDuplicates work with more containers.Stephen Kelly2015-02-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Remove the accidental requirement that the input range must be a std::vector.
| * | | | cmAlgorithms: Rename template argument to RemoveN.Stephen Kelly2015-02-241-3/+3
| | | | |
| * | | | cmAlgorithms: Relax cmRemoveN requirement to FwdIter.Stephen Kelly2015-02-241-1/+3
| | | | | | | | | | | | | | | | | | | | cmRotate already requires only FwdIter.
| * | | | cmAlgorithms: Add a size() to cmRange.Stephen Kelly2015-02-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | size() is already used by cmRemoveDuplicates, which is designed to accept a cmRange.
| * | | | cmAlgorithms: Rename template type in cmDeleteAll algorithm.Stephen Kelly2015-02-231-10/+10
| | | | | | | | | | | | | | | | | | | | It may be any range, not only a container.
| * | | | cmAlgorithms: Add const to const objects.Stephen Kelly2015-02-231-3/+3
| | | | |
* | | | | Merge topic 'FindMatlab-remove-trailing-lines'Brad King2015-02-241-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 08d1e65a FindMatlab: Remove trailing blank lines
| * | | | | FindMatlab: Remove trailing blank linesBrad King2015-02-241-1/+0
| | | | | |
* | | | | | Merge topic 'osx-CFBundleExecutable'Brad King2015-02-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78ec4b16 OS X: Shorten CFBundleExecutable to file name only
| * | | | | | OS X: Shorten CFBundleExecutable to file name onlyGregor Jasny2015-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten the CFBundleExecutable in the PList file of Bundles to the file name only as it is done for Frameworks, too. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge topic 'osx-framework-search-platform-SDKs'Brad King2015-02-244-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ee2a004 OS X: Add platform-specific Frameworks search path
| * | | | | | | OS X: Add platform-specific Frameworks search pathGregor Jasny2015-02-234-1/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise find_library is unable to lookup the XCTest framework which is not located in the SDK serach path: In the 10.10 SDK the SDK frameworks are located here: $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks whereas the Platform SDKs are located here: $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/Library/Frameworks Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge topic 'FeatureSummary-no-duplicates'Brad King2015-02-244-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38ef2b73 FeatureSummary: Print each feature info only once
| * | | | | | | FeatureSummary: Print each feature info only onceGregor Jasny2015-02-234-0/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a feature is added multiple times via ADD_FEATURE_INFO it should appear only once in FEATURE_SUMMARY. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge topic 'vs-midl-absolute-OutputDirectory'Brad King2015-02-241-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 0b54e836 VS: Specify absolute output directory for the Midl tool
| * | | | | | VS: Specify absolute output directory for the Midl toolTim Blechmann2015-02-231-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the OutputDirectory element value as an absolute path to the same location as the existing relative path. Somehow this addresses an occasional failure in a large/complex build, and should not hurt basic use cases.
* | | | | | Merge topic 'rpm_at_in_path'Brad King2015-02-243-12/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5857ca5e CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)
| * | | | | | CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)Domen Vrankar2015-02-243-12/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v2.8.12~218^2 (CPackRPM protect '@' character in filename processed in the spec file, 2013-07-05) was not necessary after commit v2.8.12~439^2 (Add support for componentized USER spec file, 2013-04-01). The latter replaced ${VAR} references in the spec file template string with \@VAR\@ references, thus protecting '@' symbols automatically. This caused CPackRPM to break paths with @ symbols. Revert the change to fix the behavior, and add a test case.
* | | | | | Merge topic 'GetPrerequisites-file-command-update'Brad King2015-02-241-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe558718 GetPrerequisites: Update output matching for newer 'file' versions
| * | | | | | GetPrerequisites: Update output matching for newer 'file' versionsMarcus Meissner2015-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect PIE binaries with newer 'file' (5.22). It no longer prints "(uses shared libraries)" but does print "interpreter": # file 5.19 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked (uses shared libs), ... # file 5.22 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, ...
* | | | | | | Merge topic 'ctest-output-options'Brad King2015-02-2483-586/+1049
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff1ddd2a ctest_upload: Add QUIET option 0b87b2a3 ctest_memcheck: Add QUIET option fc58bdb9 ctest_coverage: Add QUIET option 876a680d ctest_test: Add QUIET option 49ba4545 ctest_build: Add QUIET option f999dc0b ctest_configure: Add QUIET option 645ad117 ctest_update: Add QUIET option 19d1a559 ctest_start: Add QUIET option 1643b905 ctest_submit: Add QUIET option 12db1139 CTest: Add cmCTestOptionalLog macro
| * | | | | | | ctest_upload: Add QUIET optionZack Galbreath2015-02-239-3/+44
| | | | | | | |
generated by cgit v0.12 at 2025-09-13 17:10:13 (GMT)