summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-gui-args-11388'David Cole2010-11-091-1/+13
|\ | | | | | | | | 0476715 Fix regression to allow specifying a CMakeCache.txt file on the command line.
| * Fix regression to allow specifying a CMakeCache.txt file on the command line.Clinton Stimpson2010-11-011-1/+13
| |
* | Merge topic '11363'David Cole2010-11-091-0/+1
|\ \ | | | | | | | | | | | | fffe1c0 11363: FindBoost.cmake fails to find debug libraries in tagged layout install
| * | 11363: FindBoost.cmake fails to find debug libraries in tagged layout installPhilip Lowman2010-10-291-0/+1
| | |
* | | Merge topic 'FixBisonWithLocale'David Cole2010-11-091-4/+11
|\ \ \ | | | | | | | | | | | | | | | | 506805c Make FindBISON work properly with non-C locales (#11326)
| * | | Make FindBISON work properly with non-C locales (#11326)Alex Neundorf2010-10-181-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying the patch attached to http://public.kitware.com/Bug/view.php?id=11326 It sets LC_ALL to C before calling execute_process(), so the output is in english. Alex
* | | | Merge topic 'qt4-resources-bug5952'David Cole2010-11-091-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | de04854 Force cmake to run again when qrc dependency scanning needs to happen.
| * | | | Force cmake to run again when qrc dependency scanning needs to happen.Clinton Stimpson2010-10-151-1/+6
| | |_|/ | |/| |
* | | | Merge topic 'qt4-imports-dir'David Cole2010-11-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cfba5ef Fix regression in 2dae2f1 which added find of Qt imports dir.
| * | | | Fix regression in 2dae2f1 which added find of Qt imports dir.Clinton Stimpson2010-10-151-2/+2
| | | | |
* | | | | Merge topic 'qtdialog-use-bundleutilities'David Cole2010-11-092-363/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 249a9bb cmake-gui: use BundleUtilities in place of custom script.
| * | | | | cmake-gui: use BundleUtilities in place of custom script.Clinton Stimpson2010-10-142-363/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BundleUtilities is better supported and allows including shared Qt libs on other platforms. Also removed limitation of static Qt for windows build of cmake-gui.
* | | | | | KWSys: Teach SystemInformation about WinXP Pro and Win7Brad King2010-11-091-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify a few lines in the function QueryOSInformation. Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e Author: Marius Staring <m.staring@lumc.nl>
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-091-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-081-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-071-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-061-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-051-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-041-1/+1
| | | | | |
* | | | | | Begin post-2.8.3 developmentDavid Cole2010-11-031-2/+2
| | | | | |
* | | | | | CMake 2.8.3v2.8.3David Cole2010-11-032-1/+3
| | | | | |
* | | | | | Merge branch 'release'David Cole2010-11-032-3/+411
|\ \ \ \ \ \
| * | | | | | CMake 2.8.3-rc4David Cole2010-10-292-1/+24
| | | | | | |
| * | | | | | Merge branch 'release'David Cole2010-10-292-3/+388
| |\ \ \ \ \ \
| | * | | | | | CMake 2.8.3-rc3David Cole2010-10-202-1/+28
| | | | | | | |
| | * | | | | | Merge branch 'release'David Cole2010-10-202-3/+361
| | |\ \ \ \ \ \
| | | * | | | | | CMake 2.8.3-rc2Brad King2010-10-062-1/+81
| | | | | | | | |
| | | * | | | | | Merge branch 'release'Brad King2010-10-062-3/+281
| | | |\ \ \ \ \ \
| | | | * | | | | | CMake 2.8.3-rc1Brad King2010-09-152-3/+281
| | | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-031-1/+1
| | | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-021-1/+1
| | | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-011-2/+2
| | | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-10-311-1/+1
| | | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-10-301-1/+1
|/ / / / / / / / /
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-10-291-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge topic 'fix_ctest_working_dir'David Cole2010-10-281-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f94c7c When processing DartMeasurements use the tests working directory.
| * | | | | | | | When processing DartMeasurements use the tests working directory.Bill Hoffman2010-10-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore CMake 2.6 behavoir where the dart processing apparently was run from within the tests directory instead of the root of the build tree. This addresses issue reported on the VTK Dashboard where the Testing/Temporary directory is defined as ../../../Testing/Temporary but the DartProcessing is run with respect to the root of the build tree. This causes the regression/difference images to not be located by ctest and thus not uploaded to the dashboard.
* | | | | | | | | Merge topic 'getprerequisites-endless-path-appending'David Cole2010-10-282-14/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48e80eb Fixes to GetPrerequisites for cygwin bee4802 Append the gp_tool path to the system PATH using native slashes. 8e550ba Remove unecessary TO_CMAKE_PATH for gp_cmd_dir. 1684198 Switch to CMAKE_PATH when doing PATH comparisons on Windows. be94c49 Fixed appending PATH to dumpbin tool from growing without bounds.
| * | | | | | | | | Fixes to GetPrerequisites for cygwinDavid Partyka2010-10-272-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix IF(WIN32) guards check for cygwin. Fix checking if the depenency is in a system location to use cygwin style paths on cygwin. Also change GetPrerequisites to switch gp_tool to tools that are very unlikely to be found, ie. dumpbin on Apple and otool on Windows/Unix.
| * | | | | | | | | Append the gp_tool path to the system PATH using native slashes.David Partyka2010-10-261-0/+1
| | | | | | | | | |
| * | | | | | | | | Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.David Partyka2010-10-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is already using CMAKE style paths.
| * | | | | | | | | Switch to CMAKE_PATH when doing PATH comparisons on Windows.David Partyka2010-10-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users PATH may contain elements that end with backslash. This will escape the semicolon when iterating resulting in mismatches. Fix indentation. Fix whitespace
| * | | | | | | | | Fixed appending PATH to dumpbin tool from growing without bounds.David Partyka2010-10-252-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IF(... MATCHES ...) used for comparing directories chokes especially in the case of C:\Program Files (x86)\<blah> because of regex pattern matching. Switched this to use STREQUAL in a loop instead.
* | | | | | | | | | Merge topic 'avoid-busted-java-test-on-macs'David Cole2010-10-281-2/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8f3919 Avoid problem reading jni.h on Macs.
| * | | | | | | | | | Avoid problem reading jni.h on Macs.David Cole2010-10-251-2/+10
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple released an update recently in which there was a broken symlink for jni.h that pointed to a non-existent file. CMake had trouble configuring because it encountered an error trying to read jni.h. We avoid the problem here by introducing a variable CTEST_RUN_Java, which defaults to OFF on Macs, that indicates whether to even attempt finding java, reading jni.h and adding the "Java" CMake test. If you would like to test Java on a Mac where the jni.h symlink is not busted, feel free to pass in -DCTEST_RUN_Java:BOOL=ON when configuring CMake.
* | | | | | | | | | Merge topic 'CPackDeb-MoreControl'David Cole2010-10-282-5/+77
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a749724 CPackDeb Added several optional debian binary package fields
| * | | | | | | | | | CPackDeb Added several optional debian binary package fieldsEric NOULARD2010-10-252-5/+77
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bugs #0011355 and 0008342. The merged patch is a contribution from Michael Lasmanis and Petri Hodju with some extra documentation added by the merger.
* | | | | | | | | | Merge topic 'fix-11173'David Cole2010-10-281-2/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e1282f ExternalProject: No svn --username if empty (#11173)
| * | | | | | | | | | ExternalProject: No svn --username if empty (#11173)David Cole2010-10-221-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nor --password. But please do if non-empty. Thank you.
* | | | | | | | | | | Merge topic 'external-project-extra-gen'David Cole2010-10-281-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beeca11 Fixed parallel build for generators with EXTRA.