summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'watcom_fixes'Brad King2010-09-081-3/+16
|\ | | | | | | | | 3b7da53 Fix for bug 10388, fix various default flags.
| * Fix for bug 10388, fix various default flags.Bill Hoffman2010-09-021-3/+16
| |
* | Merge topic 'find-macports'Brad King2010-09-082-3/+6
|\ \ | | | | | | | | | | | | eae45a6 Search MacPorts /opt/local prefix on Mac
| * | Search MacPorts /opt/local prefix on MacBrad King2010-09-012-3/+6
| | | | | | | | | | | | | | | | | | Include this prefix in CMAKE_SYSTEM_PREFIX_PATH so that it will be used for all find* commands. Previously only find_library and find_path would look under /opt/local/lib and /opt/local/include, respectively.
* | | Merge topic 'ImproveFindPackageConfigMode'Brad King2010-09-083-96/+225
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cdfc9c Improve wording of the error message of find_package() in config-mode 4969c3b Improve version notice in the generated message e8ae504 Add option CONFIG_MODE to FPHSA() b4b8f96 Don't create an empty element at the end of Foo_CONSIDERED_CONFIGS/VERSIONS cc955a0 Small cleanup of FindPackageHandleStandardArgs.cmake 0367245 Replace the two vector<string,string> with one vector<struct{string,string}> 130b0e2 Improve error message in Config-mode when no appropriate version was found dfe9c95 Record all considered Config files and their versions.
| * | | Improve wording of the error message of find_package() in config-modeAlex Neundorf2010-08-311-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by Brad, this improves the wording of the error message in config-mode when config-files were found, but no suitable version. The patch also contains the small loop-optimization suggested by Brad. Alex
| * | | Improve version notice in the generated messageAlex Neundorf2010-08-301-53/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the version number is also printed if no required version was specified, but a version number was detected (showing more information shouldn't hurt). The code for generating the failure message in config-mode is moved into a separate helper macro, it was becoming too much. Alex
| * | | Add option CONFIG_MODE to FPHSA()Alex Neundorf2010-08-291-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is used for FPHSA(), it automatically handles the information created by a preceding find_package(NO_MODULE) all and creates a proper success/error message. Alex
| * | | Don't create an empty element at the end of Foo_CONSIDERED_CONFIGS/VERSIONSAlex Neundorf2010-08-291-2/+5
| | | | | | | | | | | | | | | | Alex
| * | | Small cleanup of FindPackageHandleStandardArgs.cmakeAlex Neundorf2010-08-291-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -remove unnecessary arguments _VAR1 -move code for deciding the type of the message into helper macro _FPHSA_FAILURE_MESSAGE() Alex
| * | | Replace the two vector<string,string> with one vector<struct{string,string}>Alex Neundorf2010-08-292-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch there were two separate vectors, and the code made sure they always had the same size. With this patch the code doesn't have to ensure this anymore, there is only one vector now. Alex
| * | | Improve error message in Config-mode when no appropriate version was foundAlex Neundorf2010-08-291-36/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If in config-mode config files have been found by find_package(), but their version didn't match the requested version, now all considered files and their versions are printed (instead of saying "didn't find config file) Alex
| * | | Record all considered Config files and their versions.Alex Neundorf2010-08-292-11/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested on cmake-devel, find_package in Config-mode now records all considered config-files and their versions in <package>_CONSIDERED_CONFIGS and <package>_CONSIDERED_VERSIONS respectively. Alex
* | | | Merge topic 'ctest-show-labels'Brad King2010-09-087-3/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 32242af Added CTest command --print-labels
| * | | | Added CTest command --print-labelsZach Mullen2010-08-317-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command allows a user to quickly see the list of all available test labels. The labels are also printed in verbose show only mode, alongside their corresponding tests.
* | | | | Merge topic 'CPack-PreserveSymlinksInInstalledDirs-v2'Brad King2010-09-081-1/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 013e003 CPack handle symlinks in CPACK_INSTALLED_DIRECTORIES fix for bug5430
| * | | | | CPack handle symlinks in CPACK_INSTALLED_DIRECTORIES fix for bug5430Eric NOULARD2010-08-281-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The proposed solution is to avoid to CopyIfDifferent any links found in CPACK_INSTALLED_DIRECTORIES but memorize them instead then at the end of the processing for each dir do re-create the link in the installed tree. Current patch should work if the link are "local" to the directory.
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-081-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-071-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-061-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-051-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-041-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-031-1/+1
| |_|_|_|/ |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-09-021-1/+1
| | | | |
* | | | | Merge topic 'FindGTK2_10688'Brad King2010-09-011-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7828932 10688: FindGTK2.cmake doesn't auto-detect macports
| * | | | | 10688: FindGTK2.cmake doesn't auto-detect macportsPhilip Lowman2010-08-201-1/+5
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-09-011-2/+2
| | | | | |
* | | | | | Merge topic 'FindwxWidgets-fixed-bug-9775'Brad King2010-08-311-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f51eb9c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775. 6bbf2a0 ENH: #9775 Added support for new wxWidgets 2.9 libraries.
| * | | | | | BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.Miguel A. Figueroa-Villanueva2010-08-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add new libraries in list of libs to be cleared.
| * | | | | | ENH: #9775 Added support for new wxWidgets 2.9 libraries.Miguel A. Figueroa-Villanueva2010-08-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for new libraries in wxWidgets 2.9 that are part of the main distribution. These are: wxPropertyGrid, wxSTC, wxScintilla, and wxRibbon.
* | | | | | | Merge topic 'tab-in-indent'Brad King2010-08-311-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1cbc53f Add whitespace=tab-in-indent attribute for sources
| * | | | | | | Add whitespace=tab-in-indent attribute for sourcesBrad King2010-08-301-0/+6
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Tell Git 1.7.2 and later to reject indentation with TABs.
* | | | | | | Merge topic 'MakeTargetLinkLibrariesComplainWhenNoTargetIsUsed'Brad King2010-08-313-37/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6acc71c New CMP0016 for deciding whether an unknown target in TLL() is an error. da033b1 Remove trailing whitespace 6aef6d8 Just warn in case of a bad target as only argument for t_l_l() c786635 Make target_link_libraries() complain if bad target name is used 43f96ea Remove trailing whitespace
| * | | | | | | New CMP0016 for deciding whether an unknown target in TLL() is an error.Alex Neundorf2010-08-283-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When set to OLD, target_link_libraries() silently accepts if it is called with only one argument and this one argument is not a target. When set to NEW, this is an error. By default it is a warning now. Alex
| * | | | | | | Remove trailing whitespaceAlex Neundorf2010-08-282-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | Just warn in case of a bad target as only argument for t_l_l()Alex Neundorf2010-08-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed on cmake-devel, if target_link_libraries() is called with only one argument, and this one argument is not a valid target, just print a warning but don't fail, since otherwise probably some existing code somewhere might stop building. Alex
| * | | | | | | Make target_link_libraries() complain if bad target name is usedAlex Neundorf2010-08-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | target_link_libraries() did not complain if there was only one argument, and this one (first) argument wasn't a valid target name, e.g. add_executable(hello main.cpp) target_link_libraries(-static-intel) Here the target "hello" was forgotten in the tll() call, but cmake didn't complain. With this commit it does. Alex
| * | | | | | | Remove trailing whitespaceAlex Neundorf2010-08-261-3/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'vs-utility-depends'Brad King2010-08-319-289/+271
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a99f620 Fix unused parameter warning in VS 7.1 generator 79a88c3 Refactor VS <= 7.1 utility-depends workaround 325bdb2 Factor out duplicate VS target dependency code 6bea843 Factor out global generator ComputeTargetDepends method
| * | | | | | | Fix unused parameter warning in VS 7.1 generatorBrad King2010-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmGlobalVisualStudio71Generator::WriteProjectDepends method no longer uses its 'dspname' parameter. Leave off the name to avoid the unused parameter warning. Later we should refactor the method to avoid passing the argument altogether.
| * | | | | | | Refactor VS <= 7.1 utility-depends workaroundBrad King2010-08-247-175/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 438a7e2f (Fix utility dependencies for static libraries in VS generators, 2007-04-04) implemented utility-only dependencies between linkable targets by introducing an intermediate non-linkable target. We convert a dependency of the form foo -> bar to the form foo -> bar_UTILITY -> bar to prevent foo from including bar on its link line. Previously we added the extra "_UTILITY" targets explicitly among the project targets before dependency analysis was performed. Now we generate them separately at the last moment so that cmGlobalGenerator need not be aware of them.
| * | | | | | | Factor out duplicate VS target dependency codeBrad King2010-08-245-136/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute VS target dependencies in cmGlobalVisualStudioGenerator when the main global dependency analysis is done. Use these results in each of the VS generators instead of duplicating the analysis.
| * | | | | | | Factor out global generator ComputeTargetDepends methodBrad King2010-08-242-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the global dependency analysis in its own method so individual generators can hook into this point.
* | | | | | | | Merge topic 'libarchive-tar-headers'Brad King2010-08-311-10/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e87b6bb libarchive: Remove SCHILY dev,ino,nlink attributes (#11176)
| * | | | | | | | libarchive: Remove SCHILY dev,ino,nlink attributes (#11176)Brad King2010-08-271-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least one version of GNU tar (1.15.1 with Fedora patches) does not recognize these attributes and exits with error. Do not generate them. Patch from upstream libarchive svn r2563.
* | | | | | | | | Merge topic 'vs-platforms'Brad King2010-08-3111-24/+45
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef4394d VS: Add ArchitectureId to VS 8 and 9 generators 4fec681 VS: Map /ENTRY linker option to EntryPointSymbol be49129 VS: Add more TargetMachine option values 807fca4 VS: Convert PlatformName member to a virtual method
| * | | | | | | | | VS: Add ArchitectureId to VS 8 and 9 generatorsPatrick Gansterer2010-08-265-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid duplicate architecture string literals.
| * | | | | | | | | VS: Map /ENTRY linker option to EntryPointSymbolPatrick Gansterer2010-08-261-0/+2
| | | | | | | | | |
| * | | | | | | | | VS: Add more TargetMachine option valuesPatrick Gansterer2010-08-241-0/+15
| | | | | | | | | |
| * | | | | | | | | VS: Convert PlatformName member to a virtual methodPatrick Gansterer2010-08-2410-16/+19
| | | | | | | | | |