Commit Graph

17719 Commits

Author SHA1 Message Date
David Cole 9b2299b8c2 Merge topic 'FindwxWidgets-webview-issue-12636'
d071148 FindwxWidgets: Add webview library (#12636)
2012-01-09 14:08:52 -05:00
David Cole ef58573bb3 Merge topic 'topics/FindCUDA/Find-new-libraries-upto-4.1'
154f537 Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.
2012-01-09 14:08:46 -05:00
David Cole d4fe0d0304 Merge topic 'GNUInstallDirs-DebianMultiarch'
43f83d2 GNUInstallDirs: add support for Debian multiarch
2012-01-09 14:08:39 -05:00
KWSys Robot 99a9205b4b KWSys Nightly Date Stamp 2012-01-09 00:05:03 -05:00
KWSys Robot e0d1e7e085 KWSys Nightly Date Stamp 2012-01-08 00:05:09 -05:00
KWSys Robot cad7508615 KWSys Nightly Date Stamp 2012-01-07 00:05:06 -05:00
KWSys Robot 2858f3433a KWSys Nightly Date Stamp 2012-01-06 00:05:03 -05:00
KWSys Robot a823d88149 KWSys Nightly Date Stamp 2012-01-05 00:05:03 -05:00
KWSys Robot d6f59a5293 KWSys Nightly Date Stamp 2012-01-04 00:05:09 -05:00
KWSys Robot df224727cf KWSys Nightly Date Stamp 2012-01-03 00:05:08 -05:00
KWSys Robot 40aedcbbae KWSys Nightly Date Stamp 2012-01-02 00:05:04 -05:00
KWSys Robot 7ce47e6908 KWSys Nightly Date Stamp 2012-01-01 00:05:04 -05:00
KWSys Robot 3a29d37b16 KWSys Nightly Date Stamp 2011-12-31 00:05:04 -05:00
David Cole b1d92955af Begin post-2.8.7 development 2011-12-30 15:26:24 -05:00
David Cole 7f8f6dbf45 CMake 2.8.7 2011-12-30 11:05:59 -05:00
David Cole 72d2704472 Merge branch 'release' 2011-12-30 10:58:21 -05:00
KWSys Robot add4ad1098 KWSys Nightly Date Stamp 2011-12-30 00:05:04 -05:00
KWSys Robot 15cebeb047 KWSys Nightly Date Stamp 2011-12-29 00:05:05 -05:00
KWSys Robot 38bc4b5d9e KWSys Nightly Date Stamp 2011-12-28 00:05:03 -05:00
KWSys Robot 11385ba56a KWSys Nightly Date Stamp 2011-12-27 00:05:04 -05:00
KWSys Robot 6eb0779dbe KWSys Nightly Date Stamp 2011-12-26 00:05:03 -05:00
KWSys Robot 087b8feee4 KWSys Nightly Date Stamp 2011-12-25 00:05:03 -05:00
KWSys Robot 4fe0206e92 KWSys Nightly Date Stamp 2011-12-24 00:05:04 -05:00
KWSys Robot 9fc5faceea KWSys Nightly Date Stamp 2011-12-23 00:05:05 -05:00
Jason Erb d0711486f9 FindwxWidgets: Add webview library (#12636)
Update for wxWidgets 2.9.3 to include webview component.
2011-12-22 09:29:59 -05:00
KWSys Robot b81ef0533c KWSys Nightly Date Stamp 2011-12-22 00:05:19 -05:00
David Cole a1c9de5635 CMake 2.8.7-rc2 2011-12-21 15:05:00 -05:00
David Cole 25b159cdbf Merge branch 'release' 2011-12-21 15:02:44 -05:00
KWSys Robot b4c2f40653 KWSys Nightly Date Stamp 2011-12-21 00:05:03 -05:00
James Bigler 154f53738f Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.
This addresses Bug 11882 which provided a sample implementation for adding
support for cusparse.  I went ahead and added all the libraries I thought
appropriate.
2011-12-20 14:20:04 -07:00
David Cole 7f8cf4236d Merge topic 'fix-12273-quote-arg-in-findboost'
cdf5224 FindBoost: Quote possibly empty string argument (#12273)
2011-12-20 14:22:05 -05:00
David Cole cc9319e717 Merge topic 'AddIncludePathForASMToDirectoryInformationFile'
ea68837 fix #12262: dependency scanning for ASM files
2011-12-20 14:21:52 -05:00
David Cole 7ca69a08cb Merge topic 'AddCommentToCDependencyScanner'
318b0cd Add comment about one more problem of the C depency scanner.
4bb08e0 Remove trailing whitespace
2011-12-20 14:21:43 -05:00
David Cole 7868061a6b Merge topic 'qt4-deploy-module'
3aa5432 Improve component support and output indentation.
2011-12-20 14:21:35 -05:00
David Cole c24bdb05d0 Merge topic 'avoid-mfc-test'
0e598b7 Tests: Only really run MFC test if we can build MFC apps (#11213)
2011-12-20 14:21:21 -05:00
David Cole d6a33f6d38 Merge topic 'fix_double_project_cmake_build'
5badf5f Fix the case where cmake --build failed with two project cmds in one file.
2011-12-20 14:21:06 -05:00
David Cole 16dacf3a6a Merge topic 'AutomocFineTuning'
e474dcb automoc: improved warning message in relaxed mode
96fc5d5 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
2011-12-20 14:20:32 -05:00
Bill Hoffman 5badf5f734 Fix the case where cmake --build failed with two project cmds in one file.
This adds a test that uses two project commands in the same CMakeLists.txt
file.  It also adds a fix so that cmake --build will work in that case.
The fix sets the name of the last project command in the top level
CMakeLists.txt in the cache variable CMAKE_PROJECT_NAME.  This variable
is used by cmake --build to find the project name.
2011-12-20 14:16:25 -05:00
KWSys Robot 4e98500012 KWSys Nightly Date Stamp 2011-12-20 00:05:03 -05:00
David Cole cdf522436f FindBoost: Quote possibly empty string argument (#12273)
Author: Claudio Bley
2011-12-19 10:55:41 -05:00
KWSys Robot 4bb3edfcb4 KWSys Nightly Date Stamp 2011-12-19 00:05:03 -05:00
Alex Neundorf ea6883752b fix #12262: dependency scanning for ASM files
Now also CMAKE_ASM_INCLUDE_PATH is written into
CMakeDirectoryInformation.cmake, which is necessary to make
the dependency scanning for included files work.

Alex
2011-12-18 19:15:34 +01:00
Alex Neundorf 318b0cdf23 Add comment about one more problem of the C depency scanner.
Alex
2011-12-18 15:44:33 +01:00
Alex Neundorf 4bb08e0a9b Remove trailing whitespace
Alex
2011-12-18 15:42:48 +01:00
KWSys Robot 84094cd155 KWSys Nightly Date Stamp 2011-12-18 00:05:03 -05:00
KWSys Robot 61da11ecd7 KWSys Nightly Date Stamp 2011-12-17 00:05:11 -05:00
Mike McQuaid 3aa5432315 Improve component support and output indentation. 2011-12-16 14:31:36 -07:00
David Cole 0e598b7bcd Tests: Only really run MFC test if we can build MFC apps (#11213)
Avoid problems on "undetected" VS Express build environments.
2011-12-16 16:30:10 -05:00
David Cole f7be6d616f Merge topic 'GNU-to-MS'
c213eb9 Windows-GNU: Remove extra quotes in GNUtoMS rule variable
2011-12-16 10:15:44 -05:00
David Cole ef086b5e41 Merge topic 'qtdialog-quit'
56e0499 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
2011-12-16 10:15:39 -05:00