summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMakeDetermine*Compiler: Fix typo 'lile' => 'like'Stephen Kelly2014-01-224-4/+4
|
* 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
* | Merge topic 'update-qt4-docs'Brad King2014-01-205-373/+212
|\ \ | | | | | | | | | | | | f81e67c6 Help: Update Qt4 documentation.
| * | Help: Update Qt4 documentation.Stephen Kelly2014-01-155-373/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove independent doc listing for Qt4ConfigurationSettings, Qt4Macros and UseQt4. These are implementation details. Recommend the use of IMPORTED targets. Remove references to the UseQt4 file, which is obsolete in light of the IMPORTED targets. Add documentation for automatic tool invocation and options. Remove reference to variables which should not be needed in modern implementations.
* | | 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 'hppa-binutils-flag'Brad King2014-01-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 8f2c2ccb Improve ld flags for CMake itself on Linux/HPPA
| * | | Improve ld flags for CMake itself on Linux/HPPAGuy Martin2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround binutils bug by only marking unique section starting by ".text._". This adds the HPPA workaround improved in commit b22a0f15 (bootstrap: improve ld flag for Linux/HPPA builds, 2014-01-14) not only to the bootstrap, but also to the normal build.
* | | | 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 'doc-osx-vars'Brad King2014-01-177-7/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 45056264 Help: Document CMAKE_OSX_* variables
| * | | | Help: Document CMAKE_OSX_* variablesBrad King2014-01-167-7/+52
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation entries for variables CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT Explain what each does and when/how they should be set.
* | | | 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 'GNUInstallDirs_debian-multiarch-fix'Brad King2014-01-161-5/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 620939e4 GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on Debian
| * | | | GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on DebianDaniele E. Domenichelli2014-01-151-5/+59
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not installing in /usr (i.e. /usr/local) on Debian/Ubuntu, the multiarch path is not in ldconfig path, and therefore libraries cannot be found, unless the user manually modifies the files in /etc/ld.so.conf.d, in order to include /usr/local/lib/<arch>. This patch fixes this issue by using "lib/<arch>" only if the user is installing the software in /usr, and uses "lib" in all the other cases.
* | | | Merge topic 'fix-help-if-typo'Brad King2014-01-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5968b6e0 Help: Fix typo in 'if()' command documentation
| * | | | Help: Fix typo in 'if()' command documentationRaphael Kubo da Costa2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | s/argumemnts/arguments/
* | | | | 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-159-1/+77
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 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-149-1/+77
| | | | | | |
* | | | | | | 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
| | | | | | | | |
generated by cgit v0.12 at 2024-09-22 18:37:03 (GMT)