Commit Graph

2434 Commits

Author SHA1 Message Date
Clinton Stimpson 35b91ac5c0 Fix regex for moc includes when looking for frameworks. 2010-08-02 09:39:02 -06:00
David Cole b62fe1242f ExternalProject: Use $(MAKE) whenever possible.
ExternalProject_Add calls that did not explicitly request a
CMAKE_GENERATOR would not get recursive parallel make behavior.
This commit fixes that issue.
2010-07-23 13:51:37 -04:00
Brad King 946798f405 Merge topic 'findqt4-cross-compile'
c019427 Fix mingw/VS warning message with cross compile re-org.
2010-07-20 16:00:59 -04:00
Brad King e1a4c02bac Merge topic 'resolve/doc-spelling/CPackRPM'
7739d78 Merge CPackRPM changes into doc-spelling
9203e91 Fix spelling errors reported by Lintian.
2010-07-20 16:00:29 -04:00
Clinton Stimpson c0194278ac Fix mingw/VS warning message with cross compile re-org. 2010-07-15 10:23:32 -06:00
Brad King f7a0386fc5 Merge topic 'resolve/ctest-file-checksum/remove-CTestTest3'
38c762c Merge 'remove-CTestTest3' into ctest-file-checksum
46df0b4 Activate retry code on any curl submit failure.
8705497 Checksum test should use CMAKE_TESTS_CDASH_SERVER
d0d1cdd Mock checksum failure output for old CDash versions
af5ef0c Testing for CTest checksum
86e81b5 CTest should resubmit in the checksum failed case
d6b7107 Fix subscript out of range crash
082c87e Cross-platform fixes for checksum/retry code
e525649 Checksums on CTest submit files, and retry timed out submissions.
2010-07-13 17:05:33 -04:00
Brad King 38c762c728 Merge 'remove-CTestTest3' into ctest-file-checksum
Conflicts:
	Tests/CMakeLists.txt
2010-07-13 17:01:39 -04:00
Brad King a570ba6df7 Merge topic 'external-project-launcher'
b2634b6 Detect CMake warnings and errors in build output.
012c986 ExternalProject: Add LOG_* options to hide step output
2010-07-13 14:58:11 -04:00
Brad King 36f82f06b7 Merge topic 'CPackRPM-RelocatablePackage'
604c369 CPackRPM:: [partially] support relocatable package
2010-07-13 14:54:09 -04:00
Brad King edbaf90a02 Merge topic 'FindPostgreSQL'
56da481 Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS.
106de67 Forgot the copyright notice.
5ecfe16 Adding a FindPostgreSQL.cmake module
2010-07-13 14:52:34 -04:00
Brad King 8212d90cb5 Merge topic 'findqt4-cross-compile'
7fd3739 Find correct Qt plugins for cross-compiling.
ff888dd Fix some issues with refinding when qmake executable is changed.
22e725f Tweak for cygwin, don't convert : to ;
b55da4c Add cross-compiling support to FindQt4.cmake
2010-07-13 14:48:24 -04:00
Brad King 7739d786a4 Merge CPackRPM changes into doc-spelling
Conflicts:
	Modules/CPackRPM.cmake
2010-07-13 09:46:52 -04:00
Kai Wasserbäch 9203e9187e Fix spelling errors reported by Lintian.
During a Lintian run on the binary packages of CMake in Debian I was
notified of many spelling mistakes.
2010-07-13 09:41:37 -04:00
David Cole b2634b6aa3 Detect CMake warnings and errors in build output.
Fix niggly in ExternalProject that would inadvertently
create a log file of output when a command was explicitly
set to the empty string.

Also, increase the default value for showing context
around build errors to 10 lines, up from 6. Also add
the ability to customize this setting so that users
can put it back to 6 or even lower if they want, or
show more if they want.
2010-07-10 15:04:31 -04:00
Eric NOULARD 604c3698c1 CPackRPM:: [partially] support relocatable package
The support is partial because it cannot be used if
   CPACK_SET_DESTDIR is set
   some file are installed using absolute path
2010-07-09 20:01:57 +02:00
Andrew Maclean 56da481eff Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS. 2010-07-09 15:30:21 +10:00
Andrew Maclean 106de6785a Forgot the copyright notice. 2010-07-08 10:24:52 +10:00
Andrew Maclean 5ecfe168dc Adding a FindPostgreSQL.cmake module 2010-07-08 09:49:15 +10:00
Clinton Stimpson 7fd3739ce7 Find correct Qt plugins for cross-compiling. 2010-07-06 14:37:16 -06:00
Clinton Stimpson ff888dd648 Fix some issues with refinding when qmake executable is changed. 2010-07-06 13:24:53 -06:00
Brad King 48ac8180db Merge branch 'CPackRPM-handleFileWithSpace' 2010-07-06 10:30:30 -04:00
Brad King bf3abc592e Merge branch 'CPackRPM-VariousEnhancement-0010741' 2010-07-06 10:29:48 -04:00
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 6926e9114c CPackRPM:: Quote every filenames in %file section (see bugs 10701,10871,10345) 2010-07-04 15:08:17 +02:00
Eric NOULARD c29cf0e1d2 Provides default changelog if no file is provided 2010-07-04 12:27:47 +02:00
Eric NOULARD 7486396e5b CPackRPM:: Replace - with _ in RPM Version (fix bug 0010934) 2010-07-04 11:43:33 +02:00
Rolf Eike Beer dbe7525c6e clean up some stuff in CPack RPM script
-remove trailing whitespace
-fix description of CPACK_RPM_PACKAGE_SUMMARY
-fix description of CPACK_RPM_PACKAGE_VENDOR
-fix description of CPACK_RPM_PACKAGE_PROVIDES
-do not put changelog of that file to generated RPM but read it from CPACK_RPM_CHANGELOG_FILE
-add CPACK_RPM_PACKAGE_URL
-add CPACK_RPM_PACKAGE_OBSOLETES
-add CPACK_RPM_PACKAGE_SUGGESTS
-add a loop so adding more user supplied header fields is easy

Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2010-07-04 11:11:52 +02:00
Clinton Stimpson 22e725fb88 Tweak for cygwin, don't convert : to ; 2010-07-03 08:58:25 -06:00
Clinton Stimpson b55da4c688 Add cross-compiling support to FindQt4.cmake 2010-07-02 15:47:07 -06: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