summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KWSys Nightly Date StampKWSys Robot2011-06-251-1/+1
|
* Merge topic 'use_devenv_forvs2010'Brad King2011-06-243-11/+37
|\ | | | | | | | | | | | | | | 8555c2b Look for VCExpress as a possible build tool as well as devenv. ed0075b Use relative paths for custom command inputs. 38368d5 Revert "With very long file names, VS 2010 was unable to compile files." 8cd66dc Use devenv instead of msbuild for vs2010.
| * Look for VCExpress as a possible build tool as well as devenv.Bill Hoffman2011-06-231-1/+2
| |
| * Use relative paths for custom command inputs.Bill Hoffman2011-06-221-10/+15
| | | | | | | | | | | | For source files we use full paths. This allows for longer directory names with VS2010. However, the use of full paths causes the GUI to not display the custom commands.
| * Revert "With very long file names, VS 2010 was unable to compile files."Bill Hoffman2011-06-211-1/+10
| | | | | | | | This reverts commit 945f2c2214bc80f513ed08ebe2c8003263a4ee56.
| * Use devenv instead of msbuild for vs2010.Bill Hoffman2011-06-211-9/+20
| |
* | KWSys Nightly Date StampKWSys Robot2011-06-241-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2011-06-231-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2011-06-221-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2011-06-211-1/+1
| |
* | Merge topic 'libarchive-install-copyright-notice'Brad King2011-06-201-0/+2
|\ \ | | | | | | | | | | | | d39aee4 libarchive: Install COPYING with CMake documentation
| * | libarchive: Install COPYING with CMake documentationBrad King2011-06-201-0/+2
| | |
* | | Merge topic 'FindJNI-Fedora-issue-12276'Brad King2011-06-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 93fc629 FindJNI: Search in Fedora arch-specific JVM location (#12276)
| * | | FindJNI: Search in Fedora arch-specific JVM location (#12276)Christoph Höger2011-06-151-0/+1
| | | |
* | | | Merge topic '11279_vs10sp1_and_improvements'Brad King2011-06-201-25/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | effb6bb Detect VS 2010 SP1, faster and more robust detection
| * | | | Detect VS 2010 SP1, faster and more robust detectionPhilip Lowman2011-06-151-25/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Aaron C. Meadows Adds support for detecting VS 2010 SP1 Also improves performance using CMAKE_CXX_COMPILER if it is available and for robustness falls back using try_compile() and try_run()
* | | | | Merge topic 'doc-spelling-formatting-issue-12287'Brad King2011-06-203-9/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d66459b Documentation: Fix spelling / formatting errors (#12287)
| * | | | | Documentation: Fix spelling / formatting errors (#12287)Modestas Vainius2011-06-193-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch fixes the following problems spotted by lintian: W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit
* | | | | | Merge topic 'FindBoost_bugfixes_060911'Brad King2011-06-201-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 974374a FindBoost: Also search for 1.46.1 f26d1cf FindBoost: Fixes #12188
| * | | | | | FindBoost: Also search for 1.46.1Philip Lowman2011-06-101-1/+2
| | | | | | |
| * | | | | | FindBoost: Fixes #12188Philip Lowman2011-06-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround an issue where users wanted to use Boost_LIBRARIES with the install() command and debug/optimized keywords were interfering. Now debug/optimized keywords are removed if the release & debug library are the same.
* | | | | | | Merge topic 'find_library-lib64-issue-12247+12248'Brad King2011-06-201-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ba1713 find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
| * | | | | | | find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)Brad King2011-06-151-5/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not require the C language to be enabled to do lib->lib64 conversion. The check was originally added by commit a5825cd1 (check in new find stuff, 2006-03-02) to ensure that CMAKE_SIZEOF_VOID_P is set. Since commit 3fdf1411 (FIND_LIBRARY should not require CMAKE_SIZEOF_VOID_P, 2008-02-11) the code following the check does not fail when the variable is not set, so just remove the original check. This allows conversion for any language that is enabled so long as the address size is known. Reported-by: Christoph Höger <choeger@cs.tu-berlin.de>
* | | | | | | Merge topic 'FindSWIG-find_program-NAMES-issue-12280'Brad King2011-06-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03809b1 FindSWIG: Use NAMES in find_program directives (#12280)
| * | | | | | | FindSWIG: Use NAMES in find_program directives (#12280)Julien Malik2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, regular swig (not 2.0) executable is not found automatically. Commit 55b7c87e (Add support for new swig 2.0 application, 2011-03-28) added support for finding swig 2.0 at the (accidental) expense of not finding 1.x. Fix this regression.
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-06-201-1/+1
| | | | | | | |
* | | | | | | | KWSys: Recognize color TERM=screen-256color-bce (#12287)Brad King2011-06-191-0/+1
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Davide Mancusi <arekfu@gmail.com> Acked-By: Modestas Vainius <modax@debian.org> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627853
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-06-191-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-06-181-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-06-171-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-06-161-1/+1
| |/ / / / |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-06-151-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'library-multiarch-issue-12037'Brad King2011-06-1421-6/+123
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ed19bc multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD 52a6ed2 Test find_package multiarch support (#12037) b41ad3b Teach find_(library|package) about Linux multiarch (#12037)
| * | | | multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSDModestas Vainius2011-06-133-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix linux CMAKE_LIBRARY_ARCHITECTURE_REGEX to support armel-linux-gnueabi. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on kFreeBSD. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on GNU (Hurd). Also regex is improved to support quadlets. Even if I have not seen this in the wild yet, reportedly they are possible.
| * | | | Test find_package multiarch support (#12037)Brad King2011-06-087-0/+31
| | | | |
| * | | | Teach find_(library|package) about Linux multiarch (#12037)Brad King2011-06-0812-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement support for multiarch as specified here: http://wiki.debian.org/Multiarch https://wiki.ubuntu.com/MultiarchSpec Detect the <arch> part of <prefix>/lib/<arch> from the implicit library search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE. Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should all be the same). Teach the find_library and find_package commands to search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
* | | | | Merge topic '10997_PROTOBDUF_GENERATE_CPP_returns_wrong_path'Brad King2011-06-141-2/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3982603 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dir
| * | | | | 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dirPhilip Lowman2011-06-141-2/+22
| | |_|_|/ | |/| | |
* | | | | Merge topic 'qt4-import-targets-mac'Brad King2011-06-141-23/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e7f05d9 Add imported targets support for frameworks on Mac.
| * | | | | Add imported targets support for frameworks on Mac.Clinton Stimpson2011-06-131-23/+24
| | | | | |
* | | | | | Merge topic 'qt4-useqt-module-deps'Brad King2011-06-141-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f983d1 Qt4: complete module dependencies in UseQt4.cmake
| * | | | | | Qt4: complete module dependencies in UseQt4.cmakeClinton Stimpson2011-06-131-0/+7
| |/ / / / /
* | | | | | Merge topic 'gnu-isystem-flag-issue-12258'Brad King2011-06-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33f5a83 GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)
| * | | | | | GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)Brad King2011-06-131-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo introduced by commit e28c16b4 (Split GNU compiler information files, 2009-12-02). Reported-by: Campbell Barton <ideasman42@gmail.com> Suggested-by: Michael Hertling <mhertling@online.de>
* | | | | | Merge topic 'ImproveCPackRPMdoc'Brad King2011-06-141-3/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2af80c7 Add some more Specs file tag handling. 05720c7 CPackRPM: Enhance documentation
| * | | | | | Add some more Specs file tag handling.Eric NOULARD2011-06-121-1/+5
| | | | | | |
| * | | | | | CPackRPM: Enhance documentationEric NOULARD2011-06-121-2/+8
| | | | | | |
* | | | | | | Merge topic 'ctest-no-config-report-notrun'Brad King2011-06-147-3/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4ec242 CTest: Report tests not run due to unknown configuration 77ddb6a Use cascading-if for per-config test and install code
| * | | | | | | CTest: Report tests not run due to unknown configurationBrad King2011-06-105-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When add_test(NAME) is called without the CONFIGURATIONS argument then the test is intended to run in any configuration. In multi-config generators like the VS IDE and Xcode tests created by add_test(NAME) can only be run when testing a known configuration (otherwise there is no way to generate the test command line). If no test command line is known for a particular configuration, or if no configuration is given to ctest, report the test as not run instead of silently skipping it. Also fix CMake's own TestsWorkingDirectory test invocation to correct a previously silent failure exposed by this change.
| * | | | | | | Use cascading-if for per-config test and install codeBrad King2011-06-102-2/+14
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating per-config blocks in test and install scripts replace the form IF() # config == A ENDIF() IF() # config == B ENDIF() with IF() # config == A ELSEIF() # config == B ELSE() # no config matches ENDIF() for clarity and to support the else() case cleanly.