summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CMakeDetermineCCompiler-clear-init'David Cole2012-06-211-1/+1
|\ | | | | | | | | b9ccaf5 CMakeDetermineCCompiler: Fix typo "_CXX_" -> "_C_" (#13330)
| * CMakeDetermineCCompiler: Fix typo "_CXX_" -> "_C_" (#13330)Brad King2012-06-201-1/+1
| | | | | | | | | | Initialize CMAKE_C_COMPILER_INIT before using it, rather than CMAKE_CXX_COMPILER_INIT.
* | Merge topic 'qt4-macros'David Cole2012-06-212-24/+38
|\ \ | | | | | | | | | | | | | | | | | | 0331a5a Qt4Macros: add some quotes to prevent damage from spaces in the paths f46903b Qt4Macros: improve basename extraction in QT4_ADD_DBUS_INTERFACES aa841ae FindQt4: extend documentation
| * | Qt4Macros: add some quotes to prevent damage from spaces in the pathsRolf Eike Beer2012-06-201-17/+17
| | |
| * | Qt4Macros: improve basename extraction in QT4_ADD_DBUS_INTERFACESRolf Eike Beer2012-06-201-1/+2
| | | | | | | | | | | | | | | | | | -convert the filename to lowercase before the extraction, this allows this to work even if the filename as uppercase ".XML" extension -use get_filename_component(... NAME) to strip the path
| * | FindQt4: extend documentationRolf Eike Beer2012-06-201-6/+19
| |/ | | | | | | | | -refer to AUTOMOC from QT4_AUTOMOC -mention how source file properties influence QT4_ADD_DBUS_INTERFACE
* | Merge topic 'find-devil-doc-formatting'David Cole2012-06-211-5/+16
|\ \ | | | | | | | | | | | | af988e8 FindDevIL: clean up documentation formatting
| * | FindDevIL: clean up documentation formattingRolf Eike Beer2012-06-191-5/+16
| |/
* | Merge topic 'use-string-to-cmake-path'David Cole2012-06-213-18/+6
|\ \ | | | | | | | | | | | | 3505e68 replace open coded versions of file(TO_CMAKE_PATH)
| * | replace open coded versions of file(TO_CMAKE_PATH)Rolf Eike Beer2012-06-193-18/+6
| |/
* | Merge topic 'no-explicit-usr-search'David Cole2012-06-2114-72/+0
|\ \ | | | | | | | | | | | | e93ac6f do not explicitely specify /usr and /usr/local as search paths
| * | do not explicitely specify /usr and /usr/local as search pathsRolf Eike Beer2012-06-1914-72/+0
| |/ | | | | | | If not explicitely excluded these paths are searched automatically anyway.
* | fix some typosRolf Eike Beer2012-06-193-3/+3
|/
* Merge topic 'CPackDeb-docUpdate'David Cole2012-06-191-1/+29
|\ | | | | | | | | 5ac6ca0 CPackDeb add missing documentation for some CPACK_DEBIAN_xx variables.
| * CPackDeb add missing documentation for some CPACK_DEBIAN_xx variables.Eric NOULARD2012-06-191-1/+29
| | | | | | | | Inspired-By: Doug Linden <linderd@iinet.net.au>
* | Merge topic 'FindBullet-LinearMath_Debug'David Cole2012-06-191-1/+1
|\ \ | | | | | | | | | | | | 4393b3b FindBullet: Add missing math library name (#13309)
| * | FindBullet: Add missing math library name (#13309)Jonathan Klein2012-06-181-1/+1
| |/ | | | | | | | | | | | | Add "LinearMath_Debug" to the list of names to search for BULLET_MATH_LIBRARY_DEBUG. The _Debug name is present in all other lines already. Now the script manages to find all debug&release libraries on my system.
* | Merge topic 'ninja-cldeps'David Cole2012-06-195-3/+45
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb410e8 Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build 5ead31d Ninja: try work around for bcc32 bug 1333b57 Ninja: build server fixes 9081e3a remove warning about unused parameter f430bea Ninja: maybe this fixes the bcc32 build f2c1288 Ninja: msvc6 for-scoping 44b9bbc Ninja: build with old msvc versions 57156a5 Ninja: build server fixes f1abdce Ninja: some bytes of the rc files couldn't be piped correctly 2de963d Ninja: don't remove space between command and parameters 50b6f33 Ninja: build cmcldeps with mingw c05653e Ninja: try to make GetProcessId visible ab245ff Ninja: but cl supports /nologo ... bf58e9a Ninja: no /nologo option in old rc.exe 2fb07fc Ninja: Eclipse and KDevelop fixes for ninja 518c065 Ninja: don't pollute build dir with preprocessed rc files ...
| * Ninja: fix ModuleNoticies testPeter Kuemmel2012-06-091-0/+3
| |
| * Ninja: don't set cmcldeps vars to empty string when they are not definedPeter Kuemmel2012-06-093-10/+7
| |
| * Ninja: add copyright and descriptionPeter Kuemmel2012-06-091-0/+19
| |
| * Ninja: assume cmcldeps in the same dir as cmakePeter Kuemmel2012-06-091-1/+1
| |
| * Ninja: allow spaces in source pathPeter Kuemmel2012-06-086-21/+26
| | | | | | | | And make /showIncude prefix visible for all build rules
| * Ninja: add wrapper for cl to extract dependenciesPeter Kuemmel2012-06-081-0/+18
| | | | | | | | | | | | | | | | | | | | | | cmcldeps wraps cl and adds /showInclude before calling cl. It parses the output of cl for used headers, drops system headers and writes them to a GCC like dependency file. cmcldeps uses ATM ninja code for process handling, but could be ported later to SystemTools. TODO: Why needs ninja multiple calls in the BuildDepends test?
* | Merge topic 'RemoveASMDebugOutput'David Cole2012-06-141-6/+0
|\ \ | | | | | | | | | | | | 0b343cb ASM compiler detection: remove debug output (#13270)
| * | ASM compiler detection: remove debug output (#13270)Alex Neundorf2012-06-121-6/+0
| |/ | | | | | | | | | | This must have been left in accidentially. Alex
* | Merge topic 'position-independent-targets'David Cole2012-06-1226-10/+89
|\ \ | | | | | | | | | | | | | | | | | | bd34963 Refactor generation of shared library flags 55d7aa4 Add platform variable for flags specific to shared libraries 31d7a0f Add platform variables for position independent code flags
| * | Add platform variable for flags specific to shared librariesStephen Kelly2012-06-125-2/+13
| | | | | | | | | | | | | | | | | | Store in CMAKE_${lang}_COMPILE_OPTIONS_DLL flags from CMAKE_SHARED_LIBRARY_${lang}_FLAGS that are truly exclusive to shared libraries.
| * | Add platform variables for position independent code flagsStephen Kelly2012-06-1224-8/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store in new platform variables CMAKE_${lang}_COMPILE_OPTIONS_PIC CMAKE_${lang}_COMPILE_OPTIONS_PIE flags for position independent code generation. In almost all cases, this means duplication of the CMAKE_SHARED_LIBRARY_${lang}_FLAGS for the _PIC case and using the assumed pie equivalent for the _PIE case. Note that the GNU compiler has supported -fPIE since 3.4 and that there is no -fPIC on GNU for Windows or Cygwin. There is a possibility that the _PIE variables are not correct. However, as there is no backwards compatibility to be concerned about (as the POSITION_INDEPENDENT_CODE property is not used anywhere yet), the current state suffices.
* | | Merge topic 'UseJava-13281'David Cole2012-06-121-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 5593d57 UseJava: fix find_jar() called with multiple files (#13281)
| * | | UseJava: fix find_jar() called with multiple files (#13281)Rolf Eike Beer2012-06-081-2/+2
| | |/ | |/|
* | | Merge topic 'FindBZip2-GnuWin32-registry'David Cole2012-06-121-3/+7
|\ \ \ | | | | | | | | | | | | | | | | 7c912af FindBZip2: Search locations in GnuWin32 registry
| * | | FindBZip2: Search locations in GnuWin32 registryBrad King2012-06-051-3/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | The GnuWin32 "bzip2" installer stores in the registry key HKEY_LOCAL_MACHINE\SOFTWARE\GnuWin32\Bzip2 an "InstallPath" value. Use this entry as a search location.
* | | Merge topic 'FindPythonLibs-13216'David Cole2012-06-121-2/+8
|\ \ \ | | | | | | | | | | | | | | | | 9d145b0 FindPythonLibs: honor EXACT version specification (#13216)
| * | | FindPythonLibs: honor EXACT version specification (#13216)Rolf Eike Beer2012-06-051-2/+8
| | |/ | |/|
* | | Merge topic 'CPackRPM-emptyPerComponentREQUIRES'David Cole2012-06-121-1/+4
|\ \ \ | |_|/ |/| | | | | | | | 7321c94 CPackRPM: avoid leakage of RPM directive from one component to another.
| * | CPackRPM: avoid leakage of RPM directive from one component to another.Eric NOULARD2012-06-051-1/+4
| |/ | | | | | | | | Fixes #0013248 Inspired-By: Sergei Golubchik
* | Merge topic 'Ninja-EXPORT_COMPILE_COMMANDS'David Cole2012-06-051-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Make the CMAKE_EXPORT_COMPILE_COMMANDS option work with Ninja.Stephen Kelly2012-06-041-0/+6
| |/
* | Merge topic 'moduleLibLzma'David Cole2012-06-051-0/+69
|\ \ | | | | | | | | | | | | ee26019 Add FindLibLZMA Module
| * | Add FindLibLZMA ModuleMario Bensi2012-05-311-0/+69
| |/
* | 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.
* | | 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.
* | Merge topic 'HandleEmptySIZEOF_VOID_P'David Cole2012-05-243-0/+15
|\ \ | | | | | | | | | | | | | | | 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
| * | 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.