2404 Commits

Author SHA1 Message Date
Brad King
9fbf64445d Merge branch 'CPackRPM-fixDashInRPMVersion' 2010-07-06 10:28:32 -04:00
Brad King
f315c29966 Merge branch 'FindMPI-flag-parsing' 2010-07-06 10:19:48 -04:00
Eric NOULARD
7486396e5b CPackRPM:: Replace - with _ in RPM Version (fix bug 0010934) 2010-07-04 11:43:33 +02:00
Brad King
6a04cfd359 Merge branch 'FindMPI-BlueGene-L' 2010-06-29 14:37:21 -04:00
Brad King
7adbcf672f Merge branch 'qt4-configdeps-standardmodules' 2010-06-29 14:31:14 -04:00
Brad King
51dd5d8122 Merge branch 'getprerequisites-bug10418' 2010-06-29 14:28:21 -04:00
Brad King
96c7cb26e9 FindMPI: Fix parsing of mpicc -Wl,-L link flags (#9093)
Commit d84cbd0f (FindMPI: Parse mpicc flags more carefully, 2010-06-24)
broke parsing of '-L' flags appearing after '-Wl,' by expecting a
preceding space.  Update the regular expression to allow '-Wl,-L' too.
2010-06-29 10:59:52 -04:00
Brad King
cea9389cc9 FindMPI: Trust mpicc -showme on BlueGene/L
Do not hard-code known BlueGene/L MPI libraries.  We do not know their
location so the linker cannot find them without the proper -L search
path.  The MPI compiler tells us about the libraries anyway, and if it
does not then the user can fix the problem locally by editing the
MPI_EXTRA_LIBRARY cache entry.
2010-06-28 11:42:34 -04:00
Brad King
8460059a72 FindMPI: Failure is not an error if not REQUIRED 2010-06-28 11:35:18 -04:00
Clinton Stimpson
2aa515db9e Change Qt4ConfigDependentSettings to use more standard find modules.
Let's use more standard find modules for Qt4 dependencies.  Move a few
from using pkg-config so we can do cross compiling the cmake way.
2010-06-25 13:15:10 -06:00
Brad King
d84cbd0f77 FindMPI: Parse mpicc flags more carefully (#9093)
Extend the fix from commit 68c7d3e2 (FindMPI: Do not parse -l in middle
of library name, 2010-06-24).  Parse -D, -I, -L, and -Wl only with
preceding spaces or at the beginning of the string.
2010-06-25 08:00:38 -04:00
Clinton Stimpson
9306f1beee Fix regression in 5e6634fd77969433a87c150a2fb3f2079131484f for Windows. 2010-06-24 11:15:00 -06:00
Clinton Stimpson
e6f8a86368 Fix bug 10418 - GetPrerequisites returning "not" as a dependency.
ldd can return "not found" and we need to handle it correctly.
In that case, we extract only the name of the library instead of trying for its full path.
2010-06-24 11:15:00 -06:00
Clinton Stimpson
5850b8b79a Fix performance issue with getting version from zlib.h
Some zlib.h files have ZLIB_VERSION "1.2.3.3" with 4 numbers instead of 3.
The regex is changed to grab the first 3 numbers.
It was slow because if it failed to find that string near the top of the file,
where it usually is, it would read the entire file.
2010-06-24 10:52:37 -06:00
Brad King
68c7d3e2ce FindMPI: Do not parse -l in middle of library name
We parse the output of 'mpicc -shome:link' to look for -l options
specifying libraries.  Fix the parsing regex to avoid matching the
string '-l' in the middle of a library name.
2010-06-24 11:07:19 -04:00
Brad King
ec10d005ce Merge branch 'findopenssl-win64' 2010-06-24 10:46:09 -04:00
Brad King
4ac531487b Merge branch 'CudaRTEmuLibraryForCUDA30' 2010-06-24 10:43:05 -04:00
David Cole
67f4759b55 Qualify name of extraction location with ExternalProject name.
Avoid issues with two external projects trying to extract two
separate trees at the same time into the same location. Should
fix the sporadically failing ExternalProject test on the dashboards
for parallel builds.
2010-06-23 07:04:06 -04:00
Mathieu Malaterre
fb1eb141b5 Apply patch from B. King on ML 2010-06-22 17:11:39 +02:00
Brad King
d39ffaa261 Merge branch 'finddcmtk' 2010-06-22 10:03:29 -04:00
Brad King
84fd223aee Merge branch 'remove-bad-paths-from-CMakeVSFind-modules' 2010-06-22 09:58:26 -04:00
Brad King
22301dd9e7 Merge branch 'FixCudaVersionAfterFirstRun' 2010-06-22 09:57:29 -04:00
James Bigler
bb6acb8667 Add support for the emulation version of the cudart library.
In version 3.0 of the CUDA toolkit when building code for emulation, you need to link
against a new version of the cuda run time library called cudartemu.  This CL adds a check
for the new library and uses it when present and in emulation mode.  Note that this
library is not present in previous or subsequent versions of the CUDA toolkit.
2010-06-21 17:11:57 -06:00
David Cole
682b4fdcaf Remove "Microsoft Visual Studio .NET" from VS8 and VS9 find modules.
CMake was incorrectly finding devenv from Visual Studio 7.1 installations
when asked to generate using Visual Studio 9 2008. Now, it will not.
2010-06-16 12:14:18 -04:00
Brad King
b4aa834900 Merge branch 'ctest-git-flexibility' 2010-06-15 14:10:41 -04:00
Brad King
1a759b7d05 Merge branch 'remove-qmake-query' 2010-06-15 14:05:49 -04:00
Brad King
520b760c80 Merge branch 'findthreads-irix' 2010-06-15 14:05:40 -04:00
Brad King
5444bd6ca3 Merge branch 'tru64-make-includes' 2010-06-15 14:03:26 -04:00
Brad King
7c9f39d4ba Merge branch 'fix-issue-10346' 2010-06-15 14:02:11 -04:00
Brad King
d9b2da139d Merge branch 'mingw-response-files' 2010-06-15 13:58:58 -04:00
James Bigler
1d5554201f CUDA_VERSION variable passed to REGEX needs quotes to work when not defined. 2010-06-15 10:03:40 -06:00
Mathieu Malaterre
b3cb794fec Cleanup FindOpenSSL. Add support for win64 installation. 2010-06-15 10:33:58 +02:00
Mathieu Malaterre
b9e227af84 Cleanup FindDCMTK (using foreach). Fix linking on win32 static libs. 2010-06-15 09:51:14 +02:00
Brad King
c592df8377 Tru64: Use full-path include directives in Makefiles (#10569)
Tru64's make(1) resolves relative paths in "include" directives with
respect to the includer.  This is inconsistent with all other known make
tools.  Note that this make tool treats the path literally so we cannot
use our standard FULL path code which escapes spaces.  Instead qualify
the paths with $(CMAKE_BINARY_DIR) to avoid the problem.
2010-06-14 13:06:39 -04:00
Clinton Stimpson
1f608718fc Remove macro for querying qmake for qmake variables.
Remove last place for querying qmake values.
Also removed internal macro to support querying qmake.
Depends on findthreads-irix topic.
2010-06-12 13:00:08 -06:00
Clinton Stimpson
d09664a4d4 Support pthreads on irix. 2010-06-11 18:10:38 -06:00
David Cole
cd3d60b8b5 Fix issue #10346. Error if SOURCE_DIR is empty.
See http://public.kitware.com/Bug/view.php?id=10346.
The proposed patch for the issue could not be applied as is
because the SOURCE_DIR always exists for an ExternalProject_Add
call by the time we get to the place to emit the potential error.

The fix is to emit the error only if the source dir is empty.
By which, I mean devoid of files and subdirectories. If
SOURCE_DIR is used by itself, without any DOWNLOAD_COMMAND
or repository info, then it implies that the SOURCE_DIR is ready
to build as-is without need for a download step. Clearly, if it
is empty, then it is not ready to build as is. So complain if
the SOURCE_DIR is empty.
2010-06-09 18:22:58 -04:00
Brad King
2eae651acc ctest_update: Support custom Git update command
Define CTest configuration variable CTEST_GIT_UPDATE_CUSTOM to set a
custom command line for updating Git-managed source trees.
2010-06-08 16:12:28 -04:00
Brad King
6f9bb934d4 Merge branch 'sunCC-5.11-rpath-link' 2010-06-08 09:23:11 -04:00
Brad King
6cf1ccd632 Merge branch 'per-config-link-flags' 2010-06-07 14:36:28 -04:00
Brad King
ec66c9db8c Merge branch 'cygwin-exe-export-all' 2010-06-07 14:30:21 -04:00
Brad King
0d07e4379e Merge branch 'improve-file-download'
Conflicts:
	Modules/ExternalProject.cmake
2010-06-07 14:26:24 -04:00
Brad King
a03e85f13c Merge branch 'add-git-to-ExternalProject'
Conflicts:
	Modules/ExternalProject.cmake
2010-06-07 14:23:45 -04:00
Brad King
79f01660c9 Merge branch 'more-formats-in-ExternalProject' 2010-06-07 14:22:26 -04:00
Brad King
33b59ee8dd Merge branch 'use-rename-not-copy-ExternalProject' 2010-06-07 14:22:02 -04:00
Brad King
2bc82e07bd Merge branch 'ExternalProject-fixes' 2010-06-07 14:21:49 -04:00
Brad King
ba38f0925c Merge branch 'add-svn-user-to-ExternalProject' 2010-06-07 14:21:43 -04:00
Brad King
693f98c105 Fix rpath-link flag for SunPro C++ 5.11 on Linux
Commit 82c081ba (Fix rpath-link flag for SunPro C++ on Linux,
2009-07-13) taught CMake to pass '-rpath-link' because SunPro C++ 5.9
does not support '-Wl,'.  Now SunPro C++ 5.11 does not recognize the
option without using '-Wl,'.  Detect whether to use '-Wl,' based on the
output of "sunCC -flags".
2010-06-07 10:15:58 -04:00
David Cole
29383b4b85 Add FindGit module.
Use it from ExternalProject and the ExternalProject test's
CMakeLists file rather than having duplicate find_program calls.
Add logic so that we do not try to use *.cmd variants of git
programs when using the MSYS Makefiles generator. Should fix
the last remaining dashboard issue with the new ExternalProject
git support additions.

Also, correct minor problem regarding placement of the local git
repo during test execution. On clean builds, it was being placed
incorrectly because of the ../.. relative reference. Use an absolute
path to place the local git repo in the proper directory, and only
use the relative reference when referring to it.
2010-06-03 17:30:07 -04:00
David Cole
670e16af2d Add git support to ExternalProject.
Requires at least version 1.6.5 of a git client for
git submodule update --recursive use.
2010-06-02 16:28:04 -04:00