summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'findopenssl-win64'Brad King2010-06-241-10/+28
|\
| * Apply patch from B. King on MLMathieu Malaterre2010-06-221-2/+2
| |
| * Cleanup FindOpenSSL. Add support for win64 installation.Mathieu Malaterre2010-06-151-10/+28
| |
* | Merge branch 'CudaRTEmuLibraryForCUDA30'Brad King2010-06-241-2/+23
|\ \
| * | Add support for the emulation version of the cudart library.James Bigler2010-06-211-2/+23
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Qualify name of extraction location with ExternalProject name.David Cole2010-06-231-5/+4
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'finddcmtk'Brad King2010-06-221-148/+118
|\ \ \ | | |/ | |/|
| * | Cleanup FindDCMTK (using foreach). Fix linking on win32 static libs.Mathieu Malaterre2010-06-151-148/+118
| | |
* | | Merge branch 'remove-bad-paths-from-CMakeVSFind-modules'Brad King2010-06-222-7/+0
|\ \ \
| * | | Remove "Microsoft Visual Studio .NET" from VS8 and VS9 find modules.David Cole2010-06-162-7/+0
| | |/ | |/| | | | | | | | | | CMake was incorrectly finding devenv from Visual Studio 7.1 installations when asked to generate using Visual Studio 9 2008. Now, it will not.
* | | Merge branch 'FixCudaVersionAfterFirstRun'Brad King2010-06-221-0/+4
|\ \ \ | |/ / |/| |
| * | CUDA_VERSION variable passed to REGEX needs quotes to work when not defined.James Bigler2010-06-151-2/+2
| | |
| * | Fixed: CUDA_VERSION_MAJOR/MINOR now computed after first run.James Bigler2010-05-121-0/+4
| | | | | | | | | | | | | | | | | | CUDA_VERSION_MAJOR and CUDA_VERSION_MINOR were only computed when CUDA_VERSION was first computed. Subsequent runs of FindCUDA would not have CUDA_VERSION_MAJOR/MINOR set. We now extract the major and minor versions from the CUDA_VERSION cache variable every run.
| * | -make CMAKE_ASM_FLAGS_INIT and friends work (#10577)Alex Neundorf2010-05-121-0/+35
| | | | | | | | | | | | Alex
| * | BUG: 0009840 Fix case when only Java is available by implementing COMP RuntimeMathieu Malaterre2010-05-111-9/+42
| | |
| * | Add GITCommand key value pair.Bill Hoffman2010-05-111-0/+4
| | |
| * | -use the HINTS keyword for finding FindKDE4Internal.cmakeAlex Neundorf2010-05-101-1/+1
| | | | | | | | | | | | Alex
| * | BUG #10209: Fixed FindwxWidget CXX flags parsing error.Miguel A. Figueroa-Villanueva2010-05-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Was not removing definition flags (-D...) from cxx flags, when the definition flag was last in the list returned from wx-config. --HG-- extra : rebase_source : 3452c52b92717f181e902abef38c1e2718ce3b27
* | | Merge branch 'ctest-git-flexibility'Brad King2010-06-151-0/+1
|\ \ \
| * | | ctest_update: Support custom Git update commandBrad King2010-06-081-0/+1
| | |/ | |/| | | | | | | | | | Define CTest configuration variable CTEST_GIT_UPDATE_CUSTOM to set a custom command line for updating Git-managed source trees.
* | | Merge branch 'remove-qmake-query'Brad King2010-06-152-30/+5
|\ \ \
| * | | Remove macro for querying qmake for qmake variables.Clinton Stimpson2010-06-122-30/+5
| |/ / | | | | | | | | | | | | | | | Remove last place for querying qmake values. Also removed internal macro to support querying qmake. Depends on findthreads-irix topic.
* | | Merge branch 'findthreads-irix'Brad King2010-06-151-2/+4
|\ \ \
| * | | Support pthreads on irix.Clinton Stimpson2010-06-121-2/+4
| |/ /
* | | Merge branch 'tru64-make-includes'Brad King2010-06-151-0/+1
|\ \ \
| * | | Tru64: Use full-path include directives in Makefiles (#10569)Brad King2010-06-141-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'fix-issue-10346'Brad King2010-06-151-1/+14
|\ \ \
| * | | Fix issue #10346. Error if SOURCE_DIR is empty.David Cole2010-06-091-1/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'mingw-response-files'Brad King2010-06-152-0/+3
|\ \ \ | |/ / |/| |
| * | Use response file for objects on MinGW and MSYSBrad King2010-03-112-0/+3
| | | | | | | | | | | | | | | | | | | | | Windows command lines are limited to about 32K so we need to use response files for linking very large lists of object files. See issue #10401.
* | | Merge branch 'sunCC-5.11-rpath-link'Brad King2010-06-081-1/+8
|\ \ \
| * | | Fix rpath-link flag for SunPro C++ 5.11 on LinuxBrad King2010-06-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
* | | | Merge branch 'per-config-link-flags'Brad King2010-06-071-3/+3
|\ \ \ \
| * | | | Watcom: Use LINK_FLAGS and STATIC_LIBRARY_FLAGSBrad King2010-06-011-3/+3
| |/ / / | | | | | | | | | | | | Add the <LINK_FLAGS> rule variable in Watcom command lines.
* | | | Merge branch 'cygwin-exe-export-all'Brad King2010-06-071-0/+1
|\ \ \ \
| * | | | Cygwin: Export all symbols with ENABLE_EXPORTSYaakov Selkowitz2010-05-271-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | The ENABLE_EXPORTS property exports all symbols from executables on UNIX-like platforms, typically for use by plugins. Honor this behavior on Cygwin. See issue #10122.
* | | | Merge branch 'improve-file-download'Brad King2010-06-071-11/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Modules/ExternalProject.cmake
| * | | | Improve FILE(DOWNLOAD) and ExternalProject.David Cole2010-05-271-11/+68
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve FILE(DOWNLOAD ...): - Add percent complete progress output to the FILE DOWNLOAD command. This progress output is off by default to preserve existing behavior. To turn it on, pass SHOW_PROGRESS as an argument. - Add EXPECTED_MD5 argument. Verify that the downloaded file has the expected md5 sum after download is complete. - Add documentation for SHOW_PROGRESS and EXPECTED_MD5. When the destination file exists already and has the expected md5 sum, then do not bother re-downloading the file. ("Short circuit" return.) Also, add a test that checks for the status output indicating that the short circuit behavior is actually occurring. Use a binary file for the test so that the md5 sum is guaranteed to be the same on all platforms regardless of "shifting text file line ending" issues. Improve ExternalProject: - Add argument URL_MD5. - Add verify step that compares md5 sum of .tar.gz file before extracting it. - Add md5 check to download step, too, to prevent unnecessary downloads. - Emit a warning message when a file is not verified. Indicate that the file may be corrupt or that no checksum was specified.
* | | | Merge branch 'add-git-to-ExternalProject'Brad King2010-06-072-0/+174
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Modules/ExternalProject.cmake
| * | | | Add FindGit module.David Cole2010-06-032-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add git support to ExternalProject.David Cole2010-06-021-0/+129
| |/ / / | | | | | | | | | | | | | | | | Requires at least version 1.6.5 of a git client for git submodule update --recursive use.
* | | | Merge branch 'more-formats-in-ExternalProject'Brad King2010-06-071-9/+9
|\ \ \ \
| * | | | Add .zip and .tar.bz2 extraction to ExternalProject.David Cole2010-05-311-9/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add archives of these file types and add to the test cases covered in the ExternalProject test. Also add an "Example" directory in the Tests/ExternalProject directory containing the canonical simplest example of ExternalProject usage.
* | | | Merge branch 'use-rename-not-copy-ExternalProject'Brad King2010-06-071-9/+10
|\ \ \ \
| * | | | Use RENAME, not COPY, to extract .tar.gz files.David Cole2010-05-261-9/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Use ABSOLUTE file name for the RENAME operation. (Thanks to Marcus for figuring out that it doesn't work on Linux without the ABSOLUTE bit.)
* | | | Merge branch 'ExternalProject-fixes'Brad King2010-06-071-1/+12
|\ \ \ \
| * | | | Fix issue #10258: re-configure if args change.David Cole2010-05-261-1/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue http://public.kitware.com/Bug/view.php?id=10258 Also, fix complaint that DOWNLOAD_COMMAND cannot contain arguments consisting entirely of upper case letters. It validly does when, for example, you construct a custom cvs command line and the module name is all upper case, like VTK.
* | | | Merge branch 'add-svn-user-to-ExternalProject'Brad King2010-06-071-3/+11
|\ \ \ \
| * | | | Add svn user name and password to ExternalProject.David Cole2010-05-261-3/+11
| |/ / / | | | | | | | | | | | | Thanks to JCFR for the leg work.
* | | | Recognize Clang C and C++ compilers (see #10693)Brad King2010-05-176-0/+10
|/ / / | | | | | | | | | | | | | | | | | | Map to the platform and compiler information for GNU because the compilers are command-line compatible for common operations. Later we can add Clang-specific features as necessary. We honor the preferred capitalization is "Clang", not the common mis-spelling "CLang".