summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | Calm down Borland compiler warning about "always true"Eric NOULARD2012-05-211-0/+4
| | | | | | | |
| * | | | | | | CPack allow RPM and DEB generator to be used on OSX.Eric NOULARD2012-05-205-42/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More generally add the check for possible generator "activation" at runtime depending on a generator specific check. The dynamic behavior is currently implemented only for MacOS and should be fully backward compatible for other system. Inspired-By Tom Hughes <tomtheengineer@gmail.com>
* | | | | | | | Merge topic 'CPackNSIS-warnDESTDIRandABSOLUTE'David Cole2012-05-247-2/+184
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4986d52 Use CPACK_xxx and CMAKE_xxx in a consistent way. f90223c Fix KWStyle warning 47f0dbd CPack add necessary check to detect/warns/error on ABSOLUTE DESTINATION 6ba055b CPack add easy possibility to warn about CPACK_SET_DESTDIR
| * | | | | | | | Use CPACK_xxx and CMAKE_xxx in a consistent way.Eric NOULARD2012-05-204-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_xxx vars are now used in the CMake-generated cmake_install.cmake script while CPACK_xxx equivalent vars are used from within CPack. CPack is responsible for getting/forwarding definitions of CPACK_xxxx var corresponding to CMAKE_xxxx when invoking CMake-generated install scripts. As a consequence: CMAKE_ABSOLUTE_DESTINATION_FILES CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION may be used from outside CPack as well. e.g. cmake -DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=1 -P cmake_install.cmake works as expected.
| * | | | | | | | Fix KWStyle warningEric NOULARD2012-05-151-1/+2
| | | | | | | | |
| * | | | | | | | CPack add necessary check to detect/warns/error on ABSOLUTE DESTINATIONEric NOULARD2012-05-146-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [usually] wrong usage of absolute DESTINATION in INSTALL rules keeps popping-up on the ML. We shall have some way to: 1) easily detect it. 2) forbids this for some CPack generator like NSIS In fact it should certainly be forbidden for *any* generators when used on Windows but we may implements that on top of the current patch. The patch ask the task to the generated cmake_install.cmake scripts. Those scripts are a little bit more complicated with that but iff there are absolute DESTINATION. This cost nothing if relative DESTINATION are used. Two new vars are introduced (and documented to handle that): CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION and CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION
| * | | | | | | | CPack add easy possibility to warn about CPACK_SET_DESTDIREric NOULARD2012-05-144-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPackNSIS will only warn but sooner or later it should error out
* | | | | | | | | Merge topic 'MakeDefaultInstallComponentNameConfigurable'David Cole2012-05-249-79/+111
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b71e731 -add docs for ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} 7ced073 make default install component name configurable b6fba35 -strip trailing whitespace
| * | | | | | | | | -add docs for ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}Alex Neundorf2012-05-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | make default install component name configurableAlex Neundorf2012-05-148-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now an unnamed component was always named "Unspecified". Now this name is taken from the new cmake variable CMAKE_INSTALL_DEFAULT_COMPONENT_NAME, which is initialized to "Unspecified". But it can now be set to something project-specific, per directory Alex
| * | | | | | | | | -strip trailing whitespaceAlex Neundorf2012-05-137-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | | CMake Nightly Date StampKitware Robot2012-05-241-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2012-05-231-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-05-221-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-05-211-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-05-201-1/+1
| | | | | | |