summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'hppa-bootstrap'Brad King2014-01-151-4/+1
|\ | | | | | | | | b22a0f15 bootstrap: improve ld flag for Linux/HPPA builds
| * bootstrap: improve ld flag for Linux/HPPA buildsRolf Eike Beer2014-01-151-4/+1
| | | | | | | | | | | | | | Follow up commit ca63bb10 (bootstrap: try better workaround for builds on Linux/HPPA, 2013-09-12) with an improved ld flag. Suggested-by: Guy Martin
* | Merge topic 'doc-Qt-macro-TARGET-arg'Brad King2014-01-151-7/+13
|\ \ | | | | | | | | | | | | 4608a260 Document the TARGET options in Qt4 macros.
| * | Document the TARGET options in Qt4 macros.Stephen Kelly2014-01-141-7/+13
| | | | | | | | | | | | | | | Feature introduced in commit 9ce60ff5 (Qt4Macros: Allow specifying a TARGET in invokations of macros., 2013-02-26).
* | | CMake Nightly Date StampKitware Robot2014-01-151-1/+1
| |/ |/|
* | Merge topic 'fix-cb-nmake-quotes'Brad King2014-01-141-3/+5
|\ \ | | | | | | | | | | | | f2b47197 CodeBlocks: fix unescaped command quotes when used with nmake
| * | CodeBlocks: fix unescaped command quotes when used with nmakeNils Gladitz2014-01-131-3/+5
| | |
* | | Merge topic 'update-Qt4-COMPILE_DEFINITIONS'Brad King2014-01-141-7/+1
|\ \ \ | |_|/ |/| | | | | | | | 2509c767 Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)
| * | Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)Stephen Kelly2014-01-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5bb53f6b (cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy., 2013-12-30) deprecated the config-specific COMPILE_DEFINITIONS_* properties in favour of using generator expressions. Set the directory property in UseQt4.cmake to match the INTERFACE_COMPILE_DEFINITIONS on the Qt4::QtCore and Qt5::Core IMPORTED targets. Setting QT_NO_DEBUG is sufficient because qglobal.h sets the corresponding QT_DEBUG definition if required.
* | | CMake Nightly Date StampKitware Robot2014-01-141-1/+1
| |/ |/|
* | Merge topic 'support-codelite-ide-generator'Brad King2014-01-136-0/+571
|\ \ | | | | | | | | | | | | 0c4e8c70 Add support for codelite IDE project fles
| * | Add support for codelite IDE project flesEran Ifrah2014-01-106-0/+571
| | |
* | | Merge topic 'missing-dependency-error'Brad King2014-01-1322-2/+140
|\ \ \ | | | | | | | | | | | | | | | | 0bf6f13b AddDependencies: new policy requires dependencies to exist
| * | | AddDependencies: new policy requires dependencies to existNils Gladitz2014-01-1222-2/+140
| | | | | | | | | | | | | | | | | | | | Added new policy CMP0046 which requires dependencies added by add_dependencies() to actually exist.
* | | | Merge topic 'constify'Brad King2014-01-139-56/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cbf0311 cmGlobalGenerator: Make SelectMakeProgram const. b4ff38a5 cmGlobalGenerator: Make CheckALLOW_DUPLICATE_CUSTOM_TARGETS const 8aeddf1f cmGlobalGenerator: Make some API const. 8fd0f2a7 cmGeneratorTarget: Hold a const global generator. 46315320 cmComputeLinkDepends: Hold a const global generator.
| * | | | cmGlobalGenerator: Make SelectMakeProgram const.Stephen Kelly2014-01-124-10/+10
| | | | |
| * | | | cmGlobalGenerator: Make CheckALLOW_DUPLICATE_CUSTOM_TARGETS constStephen Kelly2014-01-124-4/+4
| | | | |
| * | | | cmGlobalGenerator: Make some API const.Stephen Kelly2014-01-122-39/+55
| | | | |
| * | | | cmGeneratorTarget: Hold a const global generator.Stephen Kelly2014-01-122-2/+2
| | | | |
| * | | | cmComputeLinkDepends: Hold a const global generator.Stephen Kelly2014-01-121-1/+1
| | |_|/ | |/| |
* | | | Merge topic 'fix-find-package-mode'Brad King2014-01-133-26/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a7f393dc cmake: Future-proof --find-package mode.
| * | | | cmake: Future-proof --find-package mode.Stephen Kelly2014-01-133-26/+31
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create cmGeneratorTargets before generating generate-time information. C++ interfaces for querying build information is increasingly only available at generate time through the cmGeneratorTarget class. Ensure that the required cmGeneratorTarget instances are created. Use the cmGlobalGenerator access API to access the relevant cmGeneratorTarget instead of creating a temporary one on the stack.
* | | | Merge topic 'fix-FindPackageModeMakefileTest-Makefile'Brad King2014-01-131-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dea71aae Tests: Fix find-package mode test.
| * | | | Tests: Fix find-package mode test.Stephen Kelly2014-01-111-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The all target was depending on the clean and pngtest targets, but when running the tests with -jN, those can be executed out of order. Make the main.o target depend on the clean target instead to fix this.
* | | | Merge topic 'ninja_fix_rerun'Brad King2014-01-131-5/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6fac24d7 Ninja: Avoid re-running CMake on next build after regeneration
| * | | | Ninja: Avoid re-running CMake on next build after regenerationRobert Maynard2014-01-131-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4a6397a7 (Ninja: Track configured files so we can regenerate them, 2013-06-17) we accidentally started listing files generated by CMake as inputs to the configuration process instead of outputs from it. Move the list of files generated by CMake to the regeneration rule outputs section and tell Ninja to restat after running it.
* | | | | CMake Nightly Date StampKitware Robot2014-01-131-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-01-121-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2014-01-111-1/+1
| | |
* | | Merge topic 'remove-duplicate-file'Brad King2014-01-101-142/+0
|\ \ \ | | | | | | | | | | | | | | | | fcd5531 Tests: Remove .orig file.
| * | | Tests: Remove .orig file.Stephen Kelly2014-01-101-142/+0
| | |/ | |/| | | | | | | | | | Introduced in commit be0458c5 (InstallRules: added new variable to disable generation of install rules, 2013-12-25).
* | | Merge topic 'minor-cleanups'Brad King2014-01-102-0/+28
|\ \ \ | | | | | | | | | | | | | | | | e7a111f InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
| * | | InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelistingStephen Kelly2014-01-092-0/+28
| | | | | | | | | | | | | | | | | | | | The target properties with this prefix are whitelisted for INTERFACE_LIBRARY targets.
* | | | Merge topic 'find-java-os-x-fixes'Brad King2014-01-101-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 519084c FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)
| * | | | FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)Joe Abbey2014-01-091-0/+1
| | | | |
* | | | | Merge topic 'CheckTypeSize_fix_multiple_invocation'Brad King2014-01-101-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 8252406 CheckTypeSize: Unset temporary variables when done (#14690)
| * | | | CheckTypeSize: Unset temporary variables when done (#14690)Daniele E. Domenichelli2014-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | When the macro is invoked multiple times, the parsing variables were not unset and therefore used for all the following calls.
* | | | | CMake Nightly Date StampKitware Robot2014-01-101-1/+1
| | | | |
* | | | | Merge topic 'extend-docs'Brad King2014-01-092-5/+37
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 2f15a07 Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual. bb8bde3 Help: Add notes about relocatability of config-file packages.
| * | | | Help: Link to CMAKE_POLICY_DEFAULT_CMP<NNNN> in policies manual.Stephen Kelly2014-01-091-1/+3
| | | | |
| * | | | Help: Add notes about relocatability of config-file packages.Stephen Kelly2014-01-091-4/+34
| | |/ / | |/| |
* | | | Merge topic 'minor-cleanups'Brad King2014-01-0923-115/+272
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 531e40b cmTarget: Make GetSourceFiles populate an out-vector parameter. 38de54c cmGeneratorTarget: Add methods to access source file groups. f579fe0 Help: Fix link to MAP_IMPORTED_CONFIG_<CONFIG> 590d238 cmTarget: Handle NO_SYSTEM_FROM_IMPORTED.
| * | | | cmTarget: Make GetSourceFiles populate an out-vector parameter.Stephen Kelly2014-01-0918-33/+54
| | | | | | | | | | | | | | | | | | | | | | | | | In a future patch, this will also be populated with extra sources from the linked dependencies.
| * | | | cmGeneratorTarget: Add methods to access source file groups.Stephen Kelly2014-01-0911-77/+209
| | | | | | | | | | | | | | | | | | | | | | | | | These methods and others will be able to get a config parameter later to implement the INTERFACE_SOURCES feature.
| * | | | Help: Fix link to MAP_IMPORTED_CONFIG_<CONFIG>Stephen Kelly2014-01-081-1/+1
| | | | |
| * | | | cmTarget: Handle NO_SYSTEM_FROM_IMPORTED.Stephen Kelly2014-01-081-4/+8
| |/ / / | | | | | | | | | | | | | | | | This handling was lost in commit faedd2be (cmTarget: Fix system include annotation propagation., 2014-01-01).
* | | | Merge topic 'FindBoost-ms-debug-runtime'Brad King2014-01-091-1/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | d729899 FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)
| * | | FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)Brad King2014-01-081-1/+7
| |/ / | | | | | | | | | | | | Add an option to control use of the 'g' runtime debug library tag on MSVC tools. Default to ON to preserve existing behavior.
* | | Merge topic 'compat-help-custom-modules'Brad King2014-01-093-2/+59
|\ \ \ | | | | | | | | | | | | | | | | b177294 cmake: Implement placeholder --help-custom-modules compatibility
| * | | cmake: Implement placeholder --help-custom-modules compatibilityBrad King2014-01-083-2/+59
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of the "cmake --help-custom-modules" was removed along with the rest of the old help generation infrastructure when documentation was converted to reStructuredText. In order to avoid breaking existing project builds outright when they use a custom command that runs a command like "cmake --help-custom-modules foo.1", generate the requested file with placeholder content explaining that the option is not supported anymore.
View Lorry Controller Status