summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Move Qt tool invocation information to a generic cmake-qt manual.Stephen Kelly2014-02-023-72/+142
| | | | | | | | Add an introduction about the use of different package types, and the ability to use Qt 4 and 5 versions together in a single buildsystem. Add a section about automatic linking of the qtmain.lib library and how to disable it.
* CMake Nightly Date StampKitware Robot2014-02-011-1/+1
|
* CMake Nightly Date StampKitware Robot2014-01-311-1/+1
|
* CMake Nightly Date StampKitware Robot2014-01-301-1/+1
|
* Merge topic 'fix-Qt-autogen'Brad King2014-01-2913-250/+274
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-285-3/+85
| | | | | | | | | | 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-283-95/+73
| | | | | | | | 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-285-32/+49
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Qt4: Use IMPORTED executable names with custom commands.Stephen Kelly2014-01-281-9/+9
| | | | | | | | | | | | Finding Qt 5 can overwrite the QT_MOC_EXECUTABLE variable with the moc from Qt 5. Use the IMPORTED target with the explicit version in the name to avoid that.
| * Qt4: Create IMPORTED executable targets for all Qt executables.Stephen Kelly2014-01-281-64/+22
| | | | | | | | | | Qt 5 already has similar IMPORTED targets. The versioned namespace will allow de-conflicting the variable names between Qt 4 and Qt 5.
* | Merge topic 'ExternalProject-git-submodules'Brad King2014-01-292-6/+25
|\ \ | | | | | | | | | | | | 819015ef ExternalProject: Add option GIT_SUBMODULES
| * | ExternalProject: Add option GIT_SUBMODULESGereon Kremer2014-01-282-6/+25
| | | | | | | | | | | | | | | This option allows to filter the submodules that are checked out. Add a simple testcase for GIT_SUBMODULES option passing an empty list.
* | | Merge topic 'cygwin-RunCMake-tests'Brad King2014-01-294-4/+4
|\ \ \ | | | | | | | | | | | | | | | | 5e4b8871 Cygwin: Avoid legacy warnings in RunCMake.CMP004[1235] tests
| * | | Cygwin: Avoid legacy warnings in RunCMake.CMP004[1235] testsBrad King2014-01-284-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Set the minimum required version of CMake high enough to avoid the warning for CMAKE_LEGACY_CYGWIN_WIN32. The warning appears on stderr and breaks the expected output matching.
* | | | Merge topic 'emacs-mode-byte-compile'Brad King2014-01-291-25/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b3876bf cmake-mode.el: Replace 'setq' with 'let' or inlining d3db7126 cmake-mode.el: Don't assign to free variable save-point fbc3a6f3 cmake-mode.el: Avoid using beginning-of-buffer
| * | | | cmake-mode.el: Replace 'setq' with 'let' or inliningPhilipp Möller2014-01-281-22/+23
| | | | |
| * | | | cmake-mode.el: Don't assign to free variable save-pointPhilipp Möller2014-01-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop use of the free variable from unscreamify-cmake-buffer. The proper way to do this would be defvar or let, but it is more sensible to drop the feature completely: replace-match will shift the point and the saved-point will be invalid. More careful coding could avoid this, but seems overkill.
| * | | | cmake-mode.el: Avoid using beginning-of-bufferPhilipp Möller2014-01-281-1/+1
| | |/ / | |/| | | | | | | | | | | | | | This should not be used from lisp programs. Use the replacement suggested by the doc: (goto-char (point-min))
* | | | Merge topic 'doc-install-no-build-info'Brad King2014-01-291-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0c3cf36b Help: Do not install Sphinx html build info files
| * | | | Help: Do not install Sphinx html build info filesBrad King2014-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Exclude '.buildinfo' and 'objects.inv' from installation as part of the Sphinx-generated html documentation.
* | | | | CMake Nightly Date StampKitware Robot2014-01-291-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2014-01-281-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | CMake 2.8.12.2v2.8.12.2Brad King2014-01-162-1/+18
| | | |
| * | | Merge branch 'ninja_fix_rerun' into releaseBrad King2014-01-151-3/+0
| |\ \ \
| * \ \ \ Merge branch 'vs10-include-backslashes' into releaseBrad King2014-01-091-1/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'xcode-storyboard-file-type-2.8.12' into releaseBrad King2014-01-091-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-compile-OBJECT_DIR' into releaseBrad King2014-01-064-16/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'xcode-5.1' into releaseBrad King2014-01-061-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vs9-map-Fd' into releaseBrad King2014-01-061-0/+2
| |\ \ \ \ \ \ \ \
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-01-281-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge topic 'disallowed-cxx-subset'Brad King2014-01-271-4/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed632736 Help: Note that std::string::clear may not be used. cc04bb6c Help: Document non-use of std::set::insert.
| * | | | | | | | | Help: Note that std::string::clear may not be used.Stephen Kelly2014-01-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As found in commit 519c0a5d (Can't use std::string::clear() in cmake., 2012-09-15).
| * | | | | | | | | Help: Document non-use of std::set::insert.Stephen Kelly2014-01-271-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As found in commit 8e7c207e (Use a manual loop to insert into set::set., 2012-09-15).
* | | | | | | | | | 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
| | | | | | | | | | |