summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-06-071-55/+173
|\
| * KWIML: Report broken integer format macros on AIX 4.3Brad King2012-06-071-0/+59
| | | | | | | | | | | | | | | | | | | | The <inttypes.h> on this platform defines the macros incorrectly, as in #define PRId32 %d instead of #define PRId32 "d"
| * KWIML: Add interface to report broken integer format macrosBrad King2012-06-071-55/+114
| | | | | | | | | | | | | | The <inttypes.h> header on some platforms define the integer format macros incorrectly for some of the integer types. Document macros that we can define to report such platforms to the includer. Check these reports before trusting the system-defined macros.
* | CMake Nightly Date StampKitware Robot2012-06-061-1/+1
| |
* | Merge topic 'Ninja-EXPORT_COMPILE_COMMANDS'David Cole2012-06-059-17/+110
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 3545645 Exclude the CompileCommandOutput test on WIN32. fbaddf4 Escape the source file to be compiled if required. db839be Make the CMAKE_EXPORT_COMPILE_COMMANDS option work with Ninja. 8778357 Add newline to the output. 2c04bc0 Move the EscapeJSON method to a sharable location.
| * | Exclude the CompileCommandOutput test on WIN32.Stephen Kelly2012-06-041-1/+1
| | |
| * | Escape the source file to be compiled if required.Stephen Kelly2012-06-041-1/+4
| | | | | | | | | | | | | | | Whitespaces in paths can otherwise cause invalid command lines to be generated.
| * | Make the CMAKE_EXPORT_COMPILE_COMMANDS option work with Ninja.Stephen Kelly2012-06-045-1/+85
| | |
| * | Add newline to the output.Stephen Kelly2012-06-041-1/+1
| | |
| * | Move the EscapeJSON method to a sharable location.Stephen Kelly2012-06-043-15/+21
| | |
* | | Merge topic 'vcexpress-no-folder'David Cole2012-06-052-0/+9
|\ \ \ | | | | | | | | | | | | | | | | a0700ba VC Express doesn't support folders, ignore USE_FOLDER property
| * | | VC Express doesn't support folders, ignore USE_FOLDER propertyPeter Kuemmel2012-06-022-0/+9
| | | |
* | | | Merge topic 'moduleLibLzma'David Cole2012-06-052-1/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ee26019 Add FindLibLZMA Module
| * | | | Add FindLibLZMA ModuleMario Bensi2012-05-312-1/+70
| | | | |
* | | | | Merge topic 'fix-13261-allow-variable-overrides'David Cole2012-06-052-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8b2fb33 Mac: Add guards to CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE defaults
| * | | | | Mac: Add guards to CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE defaultsCharlie Sharpsteen2012-05-312-6/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default for `CMAKE_FIND_FRAMEWORK`, defined in `Darwin.cmake` and `Darwin-icc.cmake`, is now guarded so that it will not override command line arguments passed by users. Similarly for `CMAKE_FIND_APPBUNDLE`
* | | | | Merge topic 'qt4-phonon-backend'David Cole2012-06-051-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ad7c80c Added conditional for the phonon backend plugin.
| * | | | | Added conditional for the phonon backend plugin.Kurtis Nusbaum2012-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | If on APPLE, the phonon backend plugin is set to phonon_qt7. If on WIN32, the phonon backend plugin is set to phonon_ds9. I did not add any for generic UNIXes as they could have a whole host of things. A more comprehensive script would actually attempt to detect which phonon plugins were installed. However, this is a simple fix for now that will work for most people.
* | | | | | Merge topic 'Qt4Macros-generated-resources'David Cole2012-06-051-16/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ce67d3 Qt4Macros: Added support for generated resource files
| * | | | | | Qt4Macros: Added support for generated resource filesTobias Bieniek2012-05-291-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the QT4_ADD_RESOURCES() macro required the resource file to exist already for dependency scanning. This prevented the use of resource files that are generated by cmake because it needs the file before resolving the dependency. This patch adds support for generated resource files by not scanning the resource file for dependencies if it doesn't exist yet. The add_custom_command() to generate the resource file should add the dependencies on the files used by the resource file.
* | | | | | | CMake Nightly Date StampKitware Robot2012-06-051-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-06-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-06-031-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2012-06-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-06-011-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2012-05-311-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-05-301-1/+1
| | | |
* | | | Merge topic 'cpack-nsis-menu-links-adapted'David Cole2012-05-291-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cfc11f9 CPack: Fixed incorrect error log for CPACK_NSIS_MENU_LINKS.
| * | | | CPack: Fixed incorrect error log for CPACK_NSIS_MENU_LINKS.Fraser Hutchison2012-05-281-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This was a pull request: https://github.com/Kitware/CMake/pull/5 Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | Merge topic 'IMPORTED_LOCATION_CONFIG-docs'David Cole2012-05-291-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bdc6e32 Update the docs of IMPORTED_LOCATION_CONFIG to match the code.
| * | | | Update the docs of IMPORTED_LOCATION_CONFIG to match the code.Stephen Kelly2012-05-251-3/+3
| | | | |
* | | | | Merge topic 'kwsys-no-win32-environ-decl'David Cole2012-05-291-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0fbaa63 KWSys: Remove unused environ declaration from SystemTools
| * | | | | KWSys: Remove unused environ declaration from SystemToolsBrad King2012-05-231-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit "KWSys: Fix SystemTools environment memory handling" (2012-04-26) added a _WIN32 case inside !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H to dllimport the "environ" global. Howver, KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H is true on every Windows toolchain we support so the case is never reached. Furthermore, even if it were reached the use of dllimport is incorrect because the toolchain might not be compiling with a dynamic runtime library. Remove the unused incorrect line and supporting conditionals.
* | | | | | Merge topic 'bootstrap-old-sh'David Cole2012-05-291-9/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5dc768 bootstrap: Port back to old shells (#13199)
| * | | | | | bootstrap: Port back to old shells (#13199)Brad King2012-05-081-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f39e82c9 (bootstrap: Re-implement command line option processing, 2011-12-16) bootstrap uses POSIX shell expressions of the form "${x#y}" to remove prefix pattern 'y' from the vaule of 'x'. Although this is allowed by POSIX old shells on some platforms do not support it. Revert to using 'sed' to work with old shells.
* | | | | | | CMake Nightly Date StampKitware Robot2012-05-291-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-05-281-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-05-271-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-05-261-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-05-251-1/+1
| | | | | |
* | | | | | Merge topic 'HandleEmptySIZEOF_VOID_P'David Cole2012-05-244-0/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14b213c add test for #13241: empty SIZEOF_VOIDP in write_basic_package_version_file 00ae36f write_basic_package_version_file() now works with unset CMAKE_SIZEOF_VOID_P
| * | | | | | add test for #13241: empty SIZEOF_VOIDP in write_basic_package_version_fileAlex Neundorf2012-05-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | write_basic_package_version_file() now works with unset CMAKE_SIZEOF_VOID_PAlex Neundorf2012-05-233-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #13241. If CMAKE_SIZEOF_VOID_P is not set, either in the installed or in the using project, don't check for it. Alex
* | | | | | | Merge topic 'FindPythonLibs-doc-cache-vars'David Cole2012-05-241-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5c9af5 FindPythonLibs: Document cache variables (#13240)
| * | | | | | | FindPythonLibs: Document cache variables (#13240)Zack Galbreath2012-05-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information on how to change which install of Python is found by CMake.
* | | | | | | | Merge topic 'fortran-include-angle'David Cole2012-05-246-653/+767
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad21079 Fortran: Follow <>-style includes (#13239)
| * | | | | | | | Fortran: Follow <>-style includes (#13239)Brad King2012-05-226-653/+767
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortran sources that pass through the C preprocessor may use #include "header" syntax or #include <header> syntax. CMake already follows the former. Teach it to follow the latter.
* | | | | | | | Merge topic 'ExternalProject-Ninja-superbuild'David Cole2012-05-241-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
| * | | | | | | | ExternalProject: Fix 'make' builds with Ninja (#13159)Matt McCormick2012-05-211-2/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the build command when Ninja is the CMake Generator, but the external project is created for a project that does not use CMake but does use "make".
* | | | | | | | Merge topic 'CPack-activateRPM-DEB-onMacOS'David Cole2012-05-245-42/+144
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 801ea70 Calm down Borland compiler warning about "always true" 2a34b57 CPack allow RPM and DEB generator to be used on OSX.