summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'dev/granular-test-targets-ninja'David Cole2012-04-031-2/+2
|\ | | | | | | | | d5318e0 Create granular targets for Ninja generators too
| * Create granular targets for Ninja generators tooBen Boeckel2012-03-291-2/+2
| |
* | Merge topic 'CPackPM-fixAmazonLinux'David Cole2012-04-031-0/+1
|\ \ | | | | | | | | | | | | 3a0c60d Override topdir from rpm command line seems necessary on Amazon linux.
| * | Override topdir from rpm command line seems necessary on Amazon linux.Tom Hughes2012-03-271-0/+1
| |/ | | | | | | | | This modification should be harmless on other distro. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | Merge topic 'AutomocProperCMakeEscaping_13018'David Cole2012-03-271-7/+7
|\ \ | | | | | | | | | | | | | | | | | | 9b32475 automoc: add define to test which caused bug #13018 2066511 automoc: fix #13018, proper cmake escaping to avoid false rebuilds c652812 make cmLocalGenerator::EscapeForCMake() static
| * | automoc: fix #13018, proper cmake escaping to avoid false rebuildsAlex Neundorf2012-03-261-7/+7
| |/ | | | | | | | | | | | | | | | | | | The variables stored in the AutomocInfo.cmake file were not properly escaped, so when reading them back they could turn into lists, if they contained double quotes initially. This patch fixes this by using cmLocalGenerator::EscapeForCMake() to escape the variables properly. Alex
* | Merge topic 'ninja-generator'David Cole2012-03-271-1/+4
|\ \ | |/ |/| | | | | 6b5614f Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
| * Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flagsPeter Collingbourne2012-03-261-1/+4
| | | | | | | | | | | | | | | | Patch by Amine Khaldi! Also, start using the -MT flag to set a target name for depfiles. This works around a bug observed in distcc, as explained in the comment. Based on a patch by Alexander Usov.
* | Merge topic 'MinorFixForEcos'David Cole2012-03-211-1/+8
|\ \ | | | | | | | | | | | | 1ab4b3e guard eCos.cmake against multiple inclusion (#12987)
| * | guard eCos.cmake against multiple inclusion (#12987)Alex Neundorf2012-03-201-1/+8
| | | | | | | | | | | | Alex
* | | Merge topic 'UseRealPathWhenFindingEclipse'David Cole2012-03-211-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 00af40b Eclipse: fix #13036, make version detection work with symlinks
| * | | Eclipse: fix #13036, make version detection work with symlinksAlex Neundorf2012-03-201-1/+3
| |/ / | | | | | | | | | | | | | | | | | | This patch uses get_filename_component(REALPATH) so symlinks in the path to Eclipse are resolved, which makes the version detection work in such cases. Alex
* | | Merge topic 'findmpi_look_in_implicit_dirs'David Cole2012-03-211-0/+14
|\ \ \ | | | | | | | | | | | | | | | | 2f9ad7c Fix FindMPI for the intel compiler on linux by looking in implict directories.
| * | | Fix FindMPI for the intel compiler on linux by looking in implict directories.Bill Hoffman2012-03-201-0/+14
| |/ / | | | | | | | | | | | | | | | | | | Use the CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES to look for libraries that are in the -showme output from mpi<lang> programs. This is because some libraries reported by -showme are found there, and FindMPI will fail if they are not found.
* | | Merge topic 'ImprovedCOMPONENTSSupportInFindPackage2'David Cole2012-03-213-15/+95
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 6d100f9 find_package: Test rejection of required+optional components d81d83c add macro check_required_components() to configure_package_config_file() b15c0b4 FPHSA(): add HANDLE_COMPONENTS option 34108cd find_package: add documentation for OPTIONAL_COMPONENTS cdabde8 FPHSA(): add missing "]" to documentation f2e0a18 find_package: add OPTIONAL_COMPONENTS keyword
| * | add macro check_required_components() to configure_package_config_file()Alex Neundorf2012-03-191-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed on cmake-developers, this patch adds a macro check_required_components() to the file configured via configure_package_config_file(), so for proper handling of components in Config.cmake files users can simply call check_required_components(PackageName) and this will do the right thing. Alex
| * | FPHSA(): add HANDLE_COMPONENTS optionAlex Neundorf2012-03-191-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | if the HANDLE_COMPONENTS is used, FPHSA() now also checks all required COMPONENTS, i.e. all elements from <name>_FIND_COMPONENTS for which <name>_FIND_REQUIRED_<comp> is true, and sets <name>_FOUND only to true if all have been found. As discussed on cmake-developers. Alex
| * | find_package: add documentation for OPTIONAL_COMPONENTSAlex Neundorf2012-03-191-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds documentation for OPTIONAL_COMPONENTS to cmFindPackage.cxx, and also extends Modules/readme.txt significantly with regard to how components should be handled. Alex
| * | FPHSA(): add missing "]" to documentationAlex Neundorf2012-03-191-1/+1
| | | | | | | | | | | | Alex
* | | Merge topic 'fix-12621-xcode43'Brad King2012-03-191-13/+20
|\ \ \ | |_|/ |/| | | | | | | | | | | 0f4dfa6 CPack: Use real path to PackageMaker to find its version file (#12621) 4693cf8 Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)
| * | Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)David Cole2012-03-091-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 4.3 installs into "/Applications" by default, from the Mac App Store. Also, the paths to the available SDKs changed: they are now within the Xcode.app bundle. PackageMaker is installed as a separate program, and may be installed anywhere. It is not installed with Xcode 4.3 by default anymore. Download the "Auxiliary Tools for Xcode" to get PackageMaker. Put PackageMaker inside the Xcode.app bundle, in its nested Applications folder, or put it alongside Xcode in "/Applications" and CMake will find it. Update references to "find" paths: add new possible locations for finding Xcode.app and PackageMaker.app. Prefer the most recent version's locations first, but keep the old locations as fallback search paths, too. Thanks to all the contributors who provided and tested out various patches for fixing this issue. Especially, but by no means limited to: Francisco Requena Espí, Jamie Kirkpatrick and drfrogsplat.
* | | Merge topic 'ninja-generator'Brad King2012-03-194-4/+45
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8485208 Ninja: shell escape $(CMAKE_SOURCE_DIR) and $(CMAKE_BINARY_DIR) df84767 Ninja: add support for OBJECT_OUTPUTS, fix PrecompiledHeader test case 48eb7fc Ninja: Avoid using 'this' in member initializers bba37dd Ninja: Fix for PDB files with spaces in the path. ac800f4 Ninja: Constify use of cmCustomCommand 9a0d5a8 Ninja: add /DEF: flag to linker call d40eebd Ninja: Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator. 8c63433 Ninja: Add friend struct so it can access the private ConvertToNinjaPath. dbe3dce Ninja: add .def file support f1bb08f Ninja: ensure the output dir exists at compile time 7a6b5f4 Ninja: Remove an unnecessary variable 80ff210 Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands d2731a3 Ninja: Add a missed license header eabc9b0 Ninja: CMake: Adapt Ninja generator for per-target include dirs bada88e Merge branch 'target-include-directories' into ninja-generator 54bd175 Ninja: windows msvc: create for each target a .pdb file ...
| * | Merge branch 'target-include-directories' into ninja-generatorDavid Cole2012-02-2259-541/+1529
| |\ \
| * | | Ninja: don't define MSVC_IDE when using the ninja generatorPeter Kuemmel2012-02-181-2/+2
| | | | | | | | | | | | | | | | Thanks to Oscar Fuentes
| * | | Ninja: Add the Ninja generatorPeter Collingbourne2012-02-022-2/+34
| | | |
| * | | Provide dependency file flags to generatorPeter Collingbourne2012-02-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes compiler modules (currently only GNU) to set a CMAKE_DEPFILE_FLAGS_${lang} variable, which communicates to the generator the flags required to cause the compiler to create dependency files.
* | | | Merge topic 'ExactVersionModeForVersionFile'Brad King2012-03-132-1/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e390f87 WriteBasicConfigVersionFile: add test for ExactVersion mode 5d18223 write_basic_package_version_file: add ExactVersion mode 1c69cd8 write_basic_package_version_file(): improve documentation
| * | | | write_basic_package_version_file: add ExactVersion modeAlex Neundorf2012-03-102-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mode is for packages which consider themselves only compatible if exactly the same version is requested. The tweak version is ignored. Alex
| * | | | write_basic_package_version_file(): improve documentationAlex Neundorf2012-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add notes when which mode should be used Alex
* | | | | Merge topic 'FindCxxTest-version-4-issue-13022'Brad King2012-03-131-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | a556137 FindCxxTest: Add support for CxxTest 4 (#13022)
| * | | | FindCxxTest: Add support for CxxTest 4 (#13022)Droscy2012-03-071-2/+4
| | |_|/ | |/| | | | | | | | | | | | | | In CxxTest version 4 the Perl generator has been deleted and the Python generator is installed without the ".py" extension.
* | | | Merge topic 'qt4-deploy'David Cole2012-03-081-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2c601c1 DeployQt4: Add path to Qt dlls on Windows.
| * | | | DeployQt4: Add path to Qt dlls on Windows.Clinton Stimpson2012-03-071-0/+6
| | | | |
* | | | | Merge topic 'MakingConfigFilesEasier_ConfigureMacro'David Cole2012-03-082-26/+190
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6973e2d wrap write_basic_config_version_file as write_basic_package_version_file() 204f5d4 add CMakePackageConfigHelpers: configure_package_config_file()
| * | | | | wrap write_basic_config_version_file as write_basic_package_version_file()Alex Neundorf2012-03-072-29/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the name fits better with configure_package_config_file(), as discussed on the mailing list. Adapt the documentation accordingly. Alex
| * | | | | add CMakePackageConfigHelpers: configure_package_config_file()Alex Neundorf2012-03-071-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function configure_package_config_file() may be used instead of configure_file() for generating the Config.cmake files for installation, they help to make those files relocatable. Alex
* | | | | | Merge topic 'CPackNSIS-addMissingDoc'David Cole2012-03-082-10/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | d4719a8 Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.
| * | | | | Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.Eric NOULARD2012-03-062-10/+23
| | | | | |
* | | | | | Merge topic 'skip-install-rpath'David Cole2012-03-061-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 635bf50 Add an option to skip RPATH during installation.
| * | | | | | Add an option to skip RPATH during installation.Stephen Kelly2012-03-051-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'improve-findqt3'David Cole2012-03-061-60/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 678c24d FindQt3: fix detection of Qt3 include directory 91a1670 FindQt3: let FPHSA handle the version selection 9dae4d6 FindQt3: fix version extraction for versions with letters 2cd898d FindQt3: fix warning when Qt3 is not found
| * | | | | FindQt3: fix detection of Qt3 include directoryRolf Eike Beer2012-03-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | The include directory is likely not inside ../bin
| * | | | | FindQt3: let FPHSA handle the version selectionRolf Eike Beer2012-03-021-54/+14
| | | | | |
| * | | | | FindQt3: fix version extraction for versions with lettersRolf Eike Beer2012-03-021-2/+2
| | | | | |
| * | | | | FindQt3: fix warning when Qt3 is not foundRolf Eike Beer2012-03-021-2/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | -- Could NOT find Qt3 (missing: QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE) CreateProcess failed QT_MOC_EXECUTABLE-NOTFOUND -v CreateProcess failed QT_UIC_EXECUTABLE-NOTFOUND -version
* | | | | Merge topic 'qt4-deploy'David Cole2012-03-061-31/+41
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4689eed reflect that the QtAutomoc depends on QtGui ab9661c Remove QtGui dependency in Qt4Deploy test and verify QtSql existance. 52e8279 Fix for Qt4Deploy on some test machines. 672e3bb Add test for DeployQt4.cmake 4853e1e Fix plugin installation issues. 35cbf23 Ensure libs are passed to BundleUtilities. 0ac1535 Fix bad plugin paths. a2123e8 Fix mismatched arguments. fc6f340 Don't use QT_LIBRARIES_PLUGINS by default.
| * | | | Fix plugin installation issues.Mike McQuaid2012-02-231-13/+27
| | | | |
| * | | | Ensure libs are passed to BundleUtilities.Mike McQuaid2012-02-211-2/+2
| | | | |
| * | | | Fix bad plugin paths.Mike McQuaid2012-02-211-13/+13
| | | | |
| * | | | Fix mismatched arguments.Mike McQuaid2012-02-211-1/+1
| | | | |
generated by cgit v0.12 at 2025-01-09 02:34:19 (GMT)