summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Export: Use a macro to ensure minimum development version requirementStephen Kelly2014-02-091-1/+13
| | | | | Use the version number of the specified release, or of the current development version if the release is not yet made.
* CMake Nightly Date StampKitware Robot2014-02-091-1/+1
|
* CMake Nightly Date StampKitware Robot2014-02-081-1/+1
|
* CMake Nightly Date StampKitware Robot2014-02-071-1/+1
|
* Merge topic 'fix-Qt-autogen'Brad King2014-02-061-12/+16
|\ | | | | | | | | 8f8edeb0 QtAutogen: Only add source files to the target if AUTORCC is ON.
| * QtAutogen: Only add source files to the target if AUTORCC is ON.Stephen Kelly2014-02-051-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | The qtx_add_resources() macro adds the resource file to the output list to maintain file-level dependencies. Having the qrc file in a target sources is a precondition for AUTORCC to function. When processing the source files of a target, only add the generated qrc_<file>.cpp to the target sources if AUTORCC is ON. This avoids pre-porting conflict with the macro. Reported-by: Micha Hergarden
* | CMake Nightly Date StampKitware Robot2014-02-061-1/+1
| |
* | Merge topic 'no-policy-tweak-version'Brad King2014-02-052-70/+54
|\ \ | | | | | | | | | | | | 101057b5 Drop tweak version component from CMake Policies
| * | Drop tweak version component from CMake PoliciesBrad King2014-02-042-70/+54
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.2~105^2~2 (Teach CMake Policies about tweak version component, 2010-04-23), cmPolicies has known how to handle a policy introduced in a tweak version. This was done back when we introduced policies with the current development date version and later updated it to the release version. Now we always introduce policies using the next expected release version and explicitly set the policy to test the NEW behavior. CMake Policies (or any other features) should never be introduced in a tweak (bugfix) release, so drop the infrastructure that allows this.
* | Merge topic 'FeatureSummary-no-transitive'Brad King2014-02-051-0/+6
|\ \ | | | | | | | | | | | | a6971f65 FeatureSummary: Don't list transitive package dependencies
| * | FeatureSummary: Don't list transitive package dependenciesStephen Kelly2014-02-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a global property in the find_package implementation. Track and reset that property in the find_dependency macro. Read the property in FeatureSummary when determining whether to print output. This means that packages which are found only as dependencies are not listed by FeatureSummary, but if a project uses find_package elsewhere directly, then it will be listed by FeatureSummary. Suggested-by: Alex Merry http://thread.gmane.org/gmane.comp.kde.devel.frameworks/10640
* | | CMake Nightly Date StampKitware Robot2014-02-051-1/+1
| |/ |/|
* | Merge topic 'fix-Qt-autogen'Brad King2014-02-042-20/+26
|\ \ | | | | | | | | | | | | | | | 6053ce22 QtAutogen: Make uic work even when the source is in a subdir. 1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
| * | QtAutogen: Make uic work even when the source is in a subdir.Stephen Kelly2014-02-042-20/+26
| | | | | | | | | | | | | | | | | | Modify the includedUis to store the path to the file which includes the ui file. Reuse that path to generate the output file from the uic process.
* | | Merge topic 'osx-rpath-unique'Brad King2014-02-047-11/+94
|\ \ \ | | | | | | | | | | | | | | | | 028a5285 OS X: Make sure RPATHs are unique to avoid possible corruption.
| * | | OS X: Make sure RPATHs are unique to avoid possible corruption.Clinton Stimpson2014-02-037-11/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using link_directories() and including CMAKE_CFG_INTDIR, one can end up with duplicate RPATHs in the binary which install_name_tool cannot fix without corrupting the binary. Also, the cmake_install.cmake file has been fixed to correctly handle these generator specific variables.
* | | | CMake Nightly Date StampKitware Robot2014-02-041-1/+1
| | | |
* | | | Merge topic 'minor-cleanups'Brad King2014-02-032-9/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dcd443d4 cmTarget: Clean up the InsertCompileDefinition implementation.
| * | | | cmTarget: Clean up the InsertCompileDefinition implementation.Stephen Kelly2014-02-022-9/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | It accepts a before parameter but is never called with before=true. compile definitions are sorted by std::set, so it wouldn't make sense to allow user sorting.
* | | | Merge topic 'constify'Brad King2014-02-032-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f054201d cmMakefile: Return containers by const reference. d1ac6ffd cmMakefile: Fix minor indentation inconsistency.
| * | | | cmMakefile: Return containers by const reference.Stephen Kelly2014-02-022-6/+6
| | | | | | | | | | | | | | | | | | | | They are not implicitly shared.
| * | | | cmMakefile: Fix minor indentation inconsistency.Stephen Kelly2014-02-021-4/+4
| | |/ / | |/| |
* | | | Merge topic 'fix-visibility-inlines-hidden'Brad King2014-02-031-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | efdcebdd VisibilityInlinesHidden: only apply -fvisibility-inlines-hidden to C++ sources
| * | | | VisibilityInlinesHidden: only apply -fvisibility-inlines-hidden to C++ sourcesNils Gladitz2014-02-011-1/+5
| | | | |
* | | | | Merge topic 'codelite-generator-multi-jobs-bug-fix'Brad King2014-02-031-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 75c05113 CodeLite: Use make -jN switch when generating Unix/MinGW makefiles
| * | | | | CodeLite: Use make -jN switch when generating Unix/MinGW makefilesEran Ifrah2014-02-031-2/+6
| | | | | |
* | | | | | Merge topic 'project-version-variables'Brad King2014-02-033-3/+162
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41d2f2c4 write_basic_package_version_file: use PROJECT_VERSION 7e142c5a project: Manage VERSION variables 16d040c9 project: Add optional LANGUAGES keyword 00007dcc Help: Format project command and variable documentation
| * | | | | | project: Manage VERSION variablesBrad King2014-01-293-1/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the project() command to set variables {PROJECT,<PROJECT-NAME>}_VERSION{,_MAJOR,_MINOR,_PATCH,_TWEAK} holding the project version number and its components. Add project() command option "VERSION" to specify the version explicitly, and default to the empty string when it is not given. Since this clears variables when no VERSION is given, this may change behavior for existing projects that set the version variables themselves prior to calling project(). Add policy CMP0048 for compatibility. Suggested-by: Alex Neundorf <neundorf@kde.org>
| * | | | | | project: Add optional LANGUAGES keywordBrad King2014-01-291-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the project() command to recognize an optional "LANGUAGES" keyword after the project name and prior to the list of languages. Do not allow multiple copies of the keyword. If the keyword is specified and no languages are listed, imply NONE.
* | | | | | | CMake Nightly Date StampKitware Robot2014-02-031-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-02-021-1/+1
| |_|_|/ / |/| | | |
* | | | | 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-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
| | |