summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'osx-sysroot-escape'Brad King2014-02-131-1/+1
|\ | | | | | | | | 77b2e6f1 OS X: Escape path given to -isysroot flag
| * OS X: Escape path given to -isysroot flagBrad King2014-02-121-1/+1
| | | | | | | | | | Ensure that paths containing spaces or other special characters are escaped correctly on the command line.
* | CMake Nightly Date StampKitware Robot2014-02-131-1/+1
| |
* | Merge topic 'backward-compatibility'Brad King2014-02-124-0/+74
|\ \ | | | | | | | | | | | | | | | f2eee72f add_custom_command: Disallow use of SOURCE signatures. c248a437 Add policy CMP0049 to avoid variable expansion in source lists
| * | add_custom_command: Disallow use of SOURCE signatures.Stephen Kelly2014-02-123-0/+36
| | | | | | | | | | | | Add CMP0050 to control this behavior.
| * | Add policy CMP0049 to avoid variable expansion in source listsStephen Kelly2014-02-123-0/+38
| | |
* | | Merge topic 'dev/fix-sublime-compile-flags'Brad King2014-02-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 2d9f93ab Sublime: Pass language and config properly
| * | | Sublime: Pass language and config properlyBen Boeckel2014-02-111-1/+1
| |/ /
* | | Merge topic 'cmake-devel-version-macro'Brad King2014-02-123-15/+16
|\ \ \ | |_|/ |/| | | | | | | | 6ca6613a Export: Use the CMAKE_DEVEL_VERSION macro for build-export files.
| * | Export: Use the CMAKE_DEVEL_VERSION macro for build-export files.Stephen Kelly2014-02-113-15/+16
| | | | | | | | | | | | | | | Move the macro definition to the cmExportBuildFileGenerator.h header to share it.
* | | CMake Nightly Date StampKitware Robot2014-02-121-1/+1
| |/ |/|
* | Merge topic 'cmake-devel-version-macro'Brad King2014-02-117-11/+21
|\ \ | |/ | | | | | | | | | | 9bcc1b21 Export: Fix internal CMake version test logic d2059d25 cmVersion: Fix CMake_VERSION_ENCODE for date in patch level 28805109 cmStandardIncludes: Include cmIML/INT.h for portable integer types
| * Export: Fix internal CMake version test logicBrad King2014-02-101-4/+6
| | | | | | | | | | | | | | | | | | Fix the internal DEVEL_CMAKE_VERSION macro to use CMake_VERSION_ENCODE to compare version component-wise. Otherwise an old invocation of the macro may be tricked into using the current version when the requested major version is smaller than the current version but the requested minor version is larger. It should use the requested (old) version in that case.
| * cmVersion: Fix CMake_VERSION_ENCODE for date in patch levelBrad King2014-02-105-7/+12
| | | | | | | | | | | | | | | | | | Use a uint64_t to store encoded version numbers so we have plenty of bits available. Encode with room for up to 1000 minor releases between major releases and to encode dates until the year 10000 in the patch level. This is necessary because CMake development versions prior to release 2.8.0 used the date in the patch level, and this practice may be restored after the 3.0 release.
| * cmStandardIncludes: Include cmIML/INT.h for portable integer typesBrad King2014-02-101-0/+3
| | | | | | | | Also teach the bootstrap script to configure the needed headers.
* | Merge topic 'backward-compatibility'Brad King2014-02-111-2/+1
|\ \ | | | | | | | | | | | | 37e1894d cmTarget: Remove TODO comment.
| * | cmTarget: Remove TODO comment.Stephen Kelly2014-02-111-2/+1
| | | | | | | | | | | | | | | The current behavior is desirable because while it is common to set a per-config suffix on libraries, it is not common for exexutables.
* | | Merge topic 'eclipse-hotfix'Brad King2014-02-111-1/+6
|\ \ \ | | | | | | | | | | | | | | | | 311c0b98 Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722)
| * | | Eclipse: Skip generator expressions in COMPILE_DEFINITIONS (#14722)Stephen Kelly2014-02-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This is a hot-fix for the bug. It seems like a good idea to generally reform the generator to care about targets instead of directories, but this patch at least makes the reported error go away.
* | | | Merge topic 'graphviz-one-file'Brad King2014-02-112-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 18bef4cd graphviz: allow to disable per target graphs (#14746)
| * | | | graphviz: allow to disable per target graphs (#14746)Daniel Pfeifer2014-02-102-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeGraphVizOptions.cmake, allow the options GRAPHVIZ_GENERATE_PER_TARGET and GRAPHVIZ_GENERATE_DEPENDERS to enable the generation of per target graphs and subgraphs respectively. Both options are TRUE per default to maintain current behavior.
* | | | | CMake Nightly Date StampKitware Robot2014-02-111-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'cmake-devel-version-macro'Brad King2014-02-101-1/+13
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | eaf703f1 Export: Use a macro to ensure minimum development version requirement
| * | | 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.
* | | Merge topic 'generate-cmCommands-file'Brad King2014-02-106-88/+81
|\ \ \ | | | | | | | | | | | | | | | | 23d3d38a CMakeLists: Generate the cmCommands.cxx file.
| * | | CMakeLists: Generate the cmCommands.cxx file.Stephen Kelly2014-02-096-88/+81
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the list of commands in the CMakeLists.txt file. List the sources in the CMakeLib target, but mark them as HEADER_FILE_ONLY. This has the effect that IDEs will show the files, though they will not be built again. Add a cmCommandsForBootstrap.cxx file for bootstrapping purposes. Rename the cmExportLibraryDependencies file to match the common pattern.
* | | Merge topic 'fix-CMP0028-iface'Brad King2014-02-101-46/+49
|\ \ \ | | | | | | | | | | | | | | | | b2915238 CMP0028: Trigger on libraries from INTERFACE of dependencies.
| * | | CMP0028: Trigger on libraries from INTERFACE of dependencies.Stephen Kelly2014-02-091-46/+49
| |/ /
* | | Merge topic 'wix_desktop'Brad King2014-02-102-2/+113
|\ \ \ | | | | | | | | | | | | | | | | b78d74de CPackWiX: Add support for CPACK_CREATE_DESKTOP_LINKS
| * | | CPackWiX: Add support for CPACK_CREATE_DESKTOP_LINKSTimo Rothenpieler2014-02-082-2/+113
| | | |
* | | | Merge topic 'interface-library-signatures'Brad King2014-02-101-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6d85a6a6 add_library: Issue better diagnostic for INTERFACE GLOBAL signature. 770245e9 add_library: Test invalid GLOBAL INTERFACE signature.
| * | | | add_library: Issue better diagnostic for INTERFACE GLOBAL signature.Stephen Kelly2014-02-071-0/+7
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-02-101-1/+1
| |_|/ / |/| | |
* | | | 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.