kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,509 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

18509 Commits

Author SHA1 Message Date
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
David Cole 037616f194 Merge topic 'vs-version-ivar' 
6571f46 Fix Intel Fortran .vfproj files for VS 10
 2011-12-16 10:14:25 -05:00
David Cole ac9453c371 Merge topic 'fix-lapack-issues' 
b3c42cb FindLAPACK: List thread libs to avoid link errors (#12625)
f603cf2 FindLAPACK: Correct CMAKE_FIND_LIBRARY_SUFFIXES spelling (#12624)
 2011-12-16 10:14:17 -05:00
David Cole c68a780dec Merge topic 'qt4-deploy-module' 
4e9274e Unset configurations variable when no build type.
 2011-12-16 10:13:59 -05:00
David Cole e945df2a7e Merge topic 'CPackRPM-0012608-UserSpecificFileControl' 
121c295 CPackRPM fix #0012608 and unoticed related bug
 2011-12-16 10:13:33 -05:00
David Cole 765e9d30ae Merge topic 'ctest-no-cdash-issue-12618' 
52f937a CTest: Do not get CDash version without drop site (#12618)
 2011-12-16 10:13:12 -05:00
David Cole f189c5d7d3 Merge topic 'xcode-rerun-issue-12616' 
e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)
 2011-12-16 10:12:36 -05:00
David Cole 7e6c8edb15 Merge topic 'FortranCInterface-MinGW' 
4cb73c4 FortranCInterface: Work around mingw32-make trouble with parens
 2011-12-16 10:11:53 -05:00
David Cole 762930efe8 Merge topic 'update-cygwin-release-script' 
61a7da2 Release: Increase timeout for slow-testing cygwin build
 2011-12-16 10:11:38 -05:00
Brad King dbf05f75c3 bootstrap: Update copyright year in version report 2011-12-16 09:43:39 -05:00
KWSys Robot b15071791c KWSys Nightly Date Stamp 2011-12-16 00:05:04 -05:00
Brad King c544545c63 KWSys: Correctly handle empty environment variables 
Fix a crash which occurs when SystemTools::GetPath attempts to process
an empty environment variable.

Author: Vladimir Panteleev <vladimir@thecybershadow.net>
 2011-12-15 15:45:09 -05:00
Raphael Kubo da Costa 56e0499104 QtDialog: Set Ctrl+Q as the shortcut for quitting the program. 
QKeySequence::Quit does not work on all platforms, and since it
translates to Ctrl+Q on all platforms where it does work, Ctrl+Q was
hardcoded instead.
 2011-12-15 08:51:50 -07:00