KWSys Robot
9fc5faceea
KWSys Nightly Date Stamp
2011-12-23 00:05:05 -05:00
Brad King
ffdb37a4f7
Handle libarchive API change in archive_read_data_block
...
The offset argument type depends on the libarchive version.
2011-12-22 10:52:03 -05:00
Brad King
ffa6faa40d
libarchive: Include cm_zlib.h to get zlib used by CMake
2011-12-22 10:38:37 -05:00
Brad King
25a5e7cbc1
libarchive: Build one static cmlibarchive for CMake
...
CMake needs only a single static libarchive library and not a shared
one. Call it cmlibarchive to avoid confusion.
2011-12-22 10:38:36 -05:00
Brad King
bbdb75c5ff
libarchive: Remove -Wall -Werror from build with GNU
...
We are not developing new libarchive features. Furthermore -Werror can
break some try_compile cases.
2011-12-22 10:38:35 -05:00
Brad King
1d7ea8b629
libarchive: Do not build subdirectories not in reduced snapshot
...
Remove add_subdirectory() calls for directories not included in the
reduced libarchive snapshot. Remove options that configure settings in
the missing directories.
2011-12-22 10:38:34 -05:00
Brad King
d31bb538ef
libarchive: Add README-CMake.txt
...
Describe how to update libarchive from upstream.
2011-12-22 10:38:33 -05:00
Brad King
b2d14f705f
libarchive: Add .gitattributes for indentation with tab
2011-12-22 10:38:32 -05:00
Brad King
646cf91932
CheckCCompilerFlag: Generalize "but not for C" case ( #12633 )
...
The "warning: " part is not necessary. The case can happen on any GNU
compiler, not just an Apple version.
2011-12-22 09:40:32 -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
Brad King
3e5a80f063
Merge branch 'libarchive-upstream' into update-libarchive
...
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
2011-12-20 11:54:25 -05:00
LibArchive Upstream
2f4a3792bb
libarchive 3.0.1-r3950 (reduced)
...
Extract upstream libarchive using the following shell code.
url=https://libarchive.googlecode.com/svn/trunk
v=3.0.1
r=3950
paths="
CMakeLists.txt
COPYING
CTestConfig.cmake
build/cmake
build/pkgconfig
build/utils
build/version
libarchive/*.*
"
date=$(svn log -q -c$r $url |
sed -n "/^r/ {s/[^|]*|[^|]*|//;p;}")
svn export -r$r $url libarchive-$v-r$r &&
mkdir libarchive-$v-r$r-reduced &&
(cd libarchive-$v-r$r && tar c $paths) |
(cd libarchive-$v-r$r-reduced && tar x)
echo "r$r date: $date"
2011-12-20 11:52:11 -05:00
Brad King
f6ac86d70e
libarchive: Remove our copy to make room for new import
2011-12-20 11:47:27 -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
Philip Lowman
84079c92ca
FindProtobuf: Merge patch that allows extra import dirs
...
Added support for additional import paths during protoc invocation
time to the PROTOBUF_GENERATE_CPP public macro via a new
PROTOBUF_IMPORT_DIRS optional variable.
Patch courtesy of Miroslav Kes <mkes@ra.rockwell.com>
2011-12-18 18:02:48 -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
Brad King
c19868b256
bootstrap: Forward options after '--' to cmake
...
Provide an interface simpler than --init= to set cache values during
bootstrap builds. For example:
./bootstrap --system-zlib -- -DZLIB_ROOT=/opt/zlib
will configure CMake with a system zlib library and initialize ZLIB_ROOT
in the cache for use by FindZLIB.
2011-12-16 11:33:24 -05:00
Brad King
f39e82c9d5
bootstrap: Re-implement command line option processing
...
Use POSIX shell features to shorten and simplify bootstrap command-line
option processing.
2011-12-16 11:32:45 -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
David Cole
1706a7ed5b
Merge topic 'intel-error-regex-issue-12627'
...
56f29f4
CTest: Recognize Intel errors without space before colon (#12627 )
2011-12-16 10:15:35 -05:00
David Cole
52d5f67ec7
Merge topic 'test-Fortran-compiler-compat'
...
fcb2a27
Fix and simplify Fortran test compiler compatibility check
2011-12-16 10:15:32 -05:00
David Cole
44b6b0b5df
Merge topic 'remove-old-QtDialog-readme'
...
470bcfa
Remove the apparently outdated README in Source/QtDialog.
2011-12-16 10:15:28 -05:00
David Cole
8f8ee53729
Merge topic 'test-compiler-output-var'
...
5f6985a
Avoid clobbering variable 'OUTPUT' in compiler tests (#12628 )
2011-12-16 10:15:20 -05:00
David Cole
65db5b4a99
Merge topic 'osx-dependent-libraries'
...
5d99343
Do not link private dependent shared libraries on OS X > 10.4
2011-12-16 10:15:07 -05:00
David Cole
2f82798ef8
Merge topic 'transitive-shared-lib-depend'
...
183b950
Follow all dependencies of shared library private dependencies
2011-12-16 10:15:01 -05:00
David Cole
e44cdb04f1
Merge topic 'hp-shared-libs'
...
5720e1f
HP: Drive shared library linking with compiler front end
2011-12-16 10:14:56 -05:00
David Cole
be637d7a92
Merge topic 'fix-12441-show-custom-target-progress'
...
7ab1162
CMake: Fix progress reporting for custom targets (#12441 )
2011-12-16 10:14:52 -05:00
David Cole
c6c82f9e3e
Merge topic 'fix-12480-correct-windres-compiler-when-cross-compiling'
...
6ddb1e5
Modules: Use "windres" as rc compiler base name for cross-compiles (#12480 )
2011-12-16 10:14:42 -05:00