summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| |
* | Merge topic 'xcode-storyboard-view'Brad King2014-01-171-7/+9
|\ \ | | | | | | | | | | | | | | | 1ce02ebf Xcode: Fix storyboard view d9f1f917 Xcode: Remove dead code
| * | Xcode: Fix storyboard viewRuslan Baratov2014-01-161-3/+9
| | | | | | | | | | | | | | | | | | | | | Images and xib files must have 'lastKnownFileType' attribute to be displayed correctly. If xib file has attribute 'explicitFileType' it is displayed as raw xml. If static image has attribute 'explicitFileType' it is displayed as question mark on storyboard.
| * | Xcode: Remove dead codeRuslan Baratov2014-01-161-4/+0
| | | | | | | | | | | | | | | Variable 'ext' already checked for equality to "xib" so remove the branch that will never be executed.
* | | Merge topic 'cmmakefile-const'Brad King2014-01-1726-59/+63
|\ \ \ | | | | | | | | | | | | | | | | c768e398 cmMakefile: make some methods take const std::string& instead of const char*
| * | | cmMakefile: make some methods take const std::string& instead of const char*Rolf Eike Beer2014-01-1626-59/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most callers already have a std::string, on which they called c_str() to pass it into these methods, which internally converted it back to std::string. Pass a std::string directly to these methods now, avoiding all these conversions. Those methods that only pass in a const char* will get the conversion to std::string now only once.
* | | | CMake Nightly Date StampKitware Robot2014-01-171-1/+1
| |/ / |/| |
* | | Merge topic 'ninja_fix_rerun'Brad King2014-01-161-3/+0
|\ \ \ | | | | | | | | | | | | | | | | 20e595ab Revert "Ninja: Track configured files so we can regenerate them."
| * | | Revert "Ninja: Track configured files so we can regenerate them."Brad King2014-01-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 4a6397a7 (Ninja: Track configured files so we can regenerate them, 2013-06-17). The files reported by the method cmMakefile::GetOutputFiles() must cause CMake to re-run only if they are missing and without considering a timestamp. This is not the meaning of the implicit dependencies field so Ninja re-runs CMake too often. Another solution will have to be found to the original problem.
* | | | Merge topic 'revert-ninja_fix_rerun'Brad King2014-01-161-24/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 79859689 Revert "Ninja: Avoid re-running CMake on next build after regeneration"
| * | | | Revert "Ninja: Avoid re-running CMake on next build after regeneration"Brad King2014-01-151-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 6fac24d7 (Ninja: Avoid re-running CMake on next build after regeneration, 2014-01-09). The files reported by the method cmMakefile::GetOutputFiles() must cause CMake to re-run only if they are missing and without considering a timestamp. Therefore they cannot be listed as outputs of the re-run rule or Ninja will re-run CMake every time because the timestamp of configure_file outputs does not change. Another solution will have to be found to the original problem.
* | | | | Merge topic 'var-type-autofill'Brad King2014-01-164-16/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cfec180d cmake-gui: Remember variable type in Add Entry
| * | | | | cmake-gui: Remember variable type in Add EntrySergey Zolotarev2014-01-164-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store variable types together with their names in the variable completion list so that the type is automatically recovered when you select a variable. Keep variable names and types in separate lists. This removes the :TYPE string from completion list and the Name field and makes variable search easier. The variable names and types are now kept in two different settings - AddVariableNames and AddVariableTypes. Drop the old AddVariableCompletionEntries setting.
* | | | | | CMake Nightly Date StampKitware Robot2014-01-161-1/+1
| | | | | |
* | | | | | Merge topic 'skip-return-code'Brad King2014-01-153-1/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 3a0d164b allow to mark a test as "Not Run" with a specific return code (#8466)
| * | | | | allow to mark a test as "Not Run" with a specific return code (#8466)Rolf Eike Beer2014-01-143-1/+18
| | | | | |
* | | | | | 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
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-01-141-1/+1
|/ / / / /
* | | | | Merge topic 'support-codelite-ide-generator'Brad King2014-01-134-0/+546
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0c4e8c70 Add support for codelite IDE project fles
| * | | | | Add support for codelite IDE project flesEran Ifrah2014-01-104-0/+546
| | | | | |
* | | | | | Merge topic 'missing-dependency-error'Brad King2014-01-136-2/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bf6f13b AddDependencies: new policy requires dependencies to exist
| * | | | | | AddDependencies: new policy requires dependencies to existNils Gladitz2014-01-126-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2014-01-101-1/+1
| | |
* | | Merge topic 'minor-cleanups'Brad King2014-01-0922-114/+271
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | 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 '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.
* | | | Merge topic 'policies'Brad King2014-01-097-33/+134
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73e9340 get_target_property: Error on non-existent target. ab9f58f FindQt4: Ensure target exists before calling get_target_property. 37ebeb9 FindQt4: Fix use of get_target_property to use actual target name. 6aabb6a Genex: Use case-sensitive comparison for COMPILER_ID. 5bb53f6 cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.