summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-Qt-autogen'Brad King2014-01-292-166/+158
|\ | | | | | | | | | | | | | | | | | | | | | | | | f7ae1d8a QtAutogen: Short-circut some logic when moc is not available. 4b989d5f QtAutogen: Separate source file processing from AUTOMOC. c48d877d QtAutogen: Make some methods appropriately file-static. 394e86df QtAutogen: Fix autouic target options in the presence of a config. 964d7f2a QtAutogen: Remove unused variables. 0d934efd QtAutogen: Remove read of SKIP_AUTOUIC target property. 321e348e QtAutogen: Use Qt 4 IMPORTED targets to find executable locations. e96683b0 Qt4: Use IMPORTED executable names with custom commands. e6182f5d Qt4: Create IMPORTED executable targets for all Qt executables.
| * QtAutogen: Short-circut some logic when moc is not available.Stephen Kelly2014-01-281-3/+14
| | | | | | | | | | This is the case when AUTOMOC is false. This prevents creating rules to moc the files in the absense of moc.
| * QtAutogen: Separate source file processing from AUTOMOC.Stephen Kelly2014-01-282-94/+72
| | | | | | | | This will allow using AUTOUIC without using AUTOMOC for example.
| * QtAutogen: Make some methods appropriately file-static.Stephen Kelly2014-01-282-38/+31
| |
| * QtAutogen: Fix autouic target options in the presence of a config.Stephen Kelly2014-01-281-1/+5
| | | | | | | | Read the correct variable. Add scopes to prevent escape of variables.
| * QtAutogen: Remove unused variables.Stephen Kelly2014-01-281-2/+0
| |
| * QtAutogen: Remove read of SKIP_AUTOUIC target property.Stephen Kelly2014-01-281-7/+1
| | | | | | | | | | Skipping AUTOUIC for a target is achieved by setting the AUTOUIC target property go OFF.
| * QtAutogen: Use Qt 4 IMPORTED targets to find executable locations.Stephen Kelly2014-01-281-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | Avoid using the moc from Qt 5 with Qt 4 based targets. Moc generates a version check to ensure that such generated code does not compile. The Qt4And5Automoc unit test should have been testing this, but it was not because the test was broken. In that unit test, moc was run on trivial files which have no significant content, and in particular no Q_OBJECT macro. Therefore moc was generating empty files which do not even contain the version check. Fix this by generating files for input to moc at cmake time.
* | CMake Nightly Date StampKitware Robot2014-01-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-01-281-1/+1
| |
* | Merge topic 'constify'Brad King2014-01-2715-141/+137
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde0dab1 cmMakefile: Make ConfigureString const. bf1e1bf1 cmMakefile: Make FindSourceGroup const. 01d7ceda cmMakefile: Trivially constify some methods. 9073318f cmMakefile: Remove non-const version of method 9b05bc4f cmMakefile: Remove method declarations with no implementation. c6c0bd9d cmMakefile: Consify custom command API. d6d4eaac cmMakefile: Constify policies accessors. 2a6e56e0 cmCacheManager: Consify version accessors. 5cc9fb02 cmSourceGroup: Fix method name capitalization. fe8b0330 cmMakefile: Constify some cmSourceGroup related code. e68a3ead cmSourceFile: Use a const cmMakefile. b6292402 cmSourceFileLocation: Use a const cmMakefile. b33ea578 cmMakefile: Make GetProperty const.
| * | cmMakefile: Make ConfigureString const.Stephen Kelly2014-01-222-4/+4
| | |
| * | cmMakefile: Make FindSourceGroup const.Stephen Kelly2014-01-227-21/+21
| | | | | | | | | | | | | | | Return a pointer instead of a reference. This allows making the accessor const with the least impact.
| * | cmMakefile: Trivially constify some methods.Stephen Kelly2014-01-222-51/+51
| | |
| * | cmMakefile: Remove non-const version of methodStephen Kelly2014-01-221-7/+0
| | | | | | | | | | | | The const version suffices.
| * | cmMakefile: Remove method declarations with no implementation.Stephen Kelly2014-01-221-2/+0
| | |
| * | cmMakefile: Consify custom command API.Stephen Kelly2014-01-224-4/+4
| | |
| * | cmMakefile: Constify policies accessors.Stephen Kelly2014-01-222-7/+8
| | |
| * | cmCacheManager: Consify version accessors.Stephen Kelly2014-01-223-6/+8
| | |
| * | cmSourceGroup: Fix method name capitalization.Stephen Kelly2014-01-223-4/+4
| | | | | | | | | | | | Adhere to the dominant style.
| * | cmMakefile: Constify some cmSourceGroup related code.Stephen Kelly2014-01-224-11/+12
| | |
| * | cmSourceFile: Use a const cmMakefile.Stephen Kelly2014-01-221-5/+5
| | |
| * | cmSourceFileLocation: Use a const cmMakefile.Stephen Kelly2014-01-222-6/+6
| | |
| * | cmMakefile: Make GetProperty const.Stephen Kelly2014-01-222-15/+16
| | |
* | | Merge topic 'ctest-update-p4-unknown-revision'Brad King2014-01-271-26/+35
|\ \ \ | | | | | | | | | | | | | | | | 243cfc2f ctest_update: Handle P4 unknown revisions more robustly
| * | | ctest_update: Handle P4 unknown revisions more robustlyPedro Navarro2014-01-221-26/+35
| | | | | | | | | | | | | | | | | | | | | | | | Mark unknown revisions as such and fail instead of reporting revision 0. Otherwise CTest reports massive file updates between revisions when the server timeouts while trying to fetch the current revision number.
* | | | Merge topic 'ninja-normalize-cmake-rerun-deps'Brad King2014-01-271-6/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2c426bfb Ninja: Normalize paths of CMake re-run rule dependencies
| * | | | Ninja: Normalize paths of CMake re-run rule dependenciesBrad King2014-01-211-6/+14
| |/ / / | | | | | | | | | | | | | | | | Send all implicit dependencies through ConvertToNinjaPath. Add CMakeCache.txt before uniquifying the list.
* | | | Merge topic 'robust-ep-download-verify'Brad King2014-01-271-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a432b93b file DOWNLOAD: Display the curl result status when a hash mismatch occurs. 1cb9ef81 file DOWNLOAD: Test non-zero return status. f73f0fb3 file DOWNLOAD: Add test for bad hash. b5e2265f ExternalProject: Reattempt download when verification fails.
| * | | | file DOWNLOAD: Display the curl result status when a hash mismatch occurs.Matt McCormick2014-01-161-0/+2
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-01-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-01-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-01-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-01-241-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-01-231-1/+1
| |_|/ |/| |
* | | Merge topic 'cmake-rerun-depends'Brad King2014-01-223-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | 82d43175 Allow projects to specify extra inputs to CMake 1ef444d6 Add test case to verify CMake does not re-run on first build
| * | | Allow projects to specify extra inputs to CMakeBrad King2014-01-213-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a new 'CMAKE_CONFIGURE_DEPENDS' directory property that projects can use to specify input files to the CMake configuration process. Extend the RunCMake.Configure test to verify that the build system re-runs CMake when this input changes.
* | | | Merge topic 'cmake-E-sleep'Brad King2014-01-221-0/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | 94389f63 cmake: Add '-E sleep' command
| * | | cmake: Add '-E sleep' commandBrad King2014-01-211-0/+28
| | |/ | |/| | | | | | | Add a cmake command-line interface to provide a cross-platform 'sleep'.
* | | Merge topic 'qcc-id'Brad King2014-01-223-1/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | e00db59d QNX: Introduce QCC compiler id for that QNX platform compiler. d2dea79b CMakeDetermine*Compiler: Fix typo 'lile' => 'like'
| * | | QNX: Introduce QCC compiler id for that QNX platform compiler.Stephen Kelly2014-01-223-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce policy CMP0047 to control resetting the id for compatibility. De-duplicate content in the QNX platform file by including the GNU one. QNX is a form of GNU platform. Do not clear CMAKE_SHARED_LIBRARY_${lang}_FLAGS variables. They are populated again later by the Compiler/GNU.cmake file anyway. Modify the CMAKE_CXX_COMPILE_OBJECT variable only when the QCC compiler id is in use, and the language is CXX. Use the QNX recommended flag for QCC instead of the gcc compatible -x flag. Populate new module files to handle system includes and depfiles when using the QCC compiler. Remove code which unsets the system include and depfiles related variables. When a GNU driver is used instead of the QCC one, the appropriate flags will be used. These variables were previously cleared for lowest-common-denominator compatibility with both drivers.
* | | | CMake Nightly Date StampKitware Robot2014-01-221-1/+1
| |/ / |/| |
* | | Merge topic 'cmake-E-symlink-replace-dangling'Brad King2014-01-211-15/+17
|\ \ \ | | | | | | | | | | | | | | | | e0228e2b cmake: Improve '-E create_symlink' edge case handling (#14713)
| * | | cmake: Improve '-E create_symlink' edge case handling (#14713)Brad King2014-01-201-15/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit ffc0b5e4 (Overwrite the symlink if it already exists, 2007-02-15) does not recognize and remove existing broken links before replacing them. Improve the logic to remove any existing destination file or link (but not directory). On failure, report an error message explaining why the existing path could not be removed or the new one could not be created. Add a RunCMake.CommandLine test to cover 'cmake -E' cases. Start with test cases covering 'cmake -E create_symlink' behavior on UNIX platforms.
* | | CMake Nightly Date StampKitware Robot2014-01-211-1/+1
|/ /
* | Merge topic 'KateDontRequireVariable'Brad King2014-01-201-1/+1
|\ \ | | | | | | | | | | | | e02cdba0 Kate: use cmMakefile::GetSafeDefinition() for a not-required variable
| * | Kate: use cmMakefile::GetSafeDefinition() for a not-required variableAlex Neundorf2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | ...otherwise the generator failed in embedded projects via externalproject(), since there CMAKE_KATE_MAKE_ARGUMENT is not set. Using GetSafeDefinition() is good enough to protect against NULL-pointers. Alex
* | | CMake Nightly Date StampKitware Robot2014-01-201-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-01-191-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-01-181-1/+1
| | |