summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'find_package-system-registry'Brad King2011-04-194-30/+137
|\ | | | | | | | | | | | | | | | | | | | | 08b9397 find_package: Fix system package registry test path conversion 93021ad find_package: Test system package registry when possible b95f3ca find_package: Check both 32-bit and 64-bit registry views a0d76c1 find_package: Search a "system package registry" 549458f find_package: Document user package registry locations c9563db find_package: Cleanup user package registry less aggressively 4df1197 find_package: Rename implementation of user package registry
| * find_package: Fix system package registry test path conversionBrad King2011-04-141-1/+1
| | | | | | | | | | | | | | Do not use file(TO_NATIVE_PATH) to compute the value to store in the registry. It is meant for constructing values to be put in shells. Since find_package() can use the value with CMake-normalized slashes do not bother with any conversion.
| * find_package: Test system package registry when possibleBrad King2011-04-132-0/+42
| | | | | | | | | | | | Teach the FindPackagTest to try creating the appropriate HKLM system package registry value. If it works then add a test to verify that find_package() reads it as expected. Then delete the value to cleanup.
| * find_package: Check both 32-bit and 64-bit registry viewsBrad King2011-04-132-6/+40
| | | | | | | | | | | | The system package registry is under HKEY_LOCAL_MACHINE\SOFTWARE which has separate views for 32-bit and 64-bit applications. Look in both views, but prefer the architecture matching the build target platform.
| * find_package: Search a "system package registry"Brad King2011-04-132-14/+39
| | | | | | | | | | | | | | | | Generalize the "user package registry" created by commit ed0650f6 (Teach find_package to search a "package registry", 2009-09-01). Define a corresponding "system" registry key under HKEY_LOCAL_MACHINE. This gives package installers a place to create a registry value that points at the right location for find_package() to locate the package.
| * find_package: Document user package registry locationsBrad King2011-04-131-3/+10
| | | | | | | | | | Specify the Windows registry key under HKEY_CURRENT_USER and directory on UNIX platforms in which the package registry is stored.
| * find_package: Cleanup user package registry less aggressivelyBrad King2011-04-131-4/+3
| | | | | | | | | | | | Delete only REG_SZ entries that are specifically detected to point to invalid paths. This will allow future versions to add other value types for different purposes.
| * find_package: Rename implementation of user package registryBrad King2011-04-132-7/+7
| | | | | | | | | | Rename {Registry => UserRegistry} in names associated specifically with the user package registry and not registry access in general.
* | Merge topic 'FindITK-passthru'Brad King2011-04-191-7/+9
|\ \ | | | | | | | | | | | | aa170c2 FindITK: Use passthru find_package config mode for messages
| * | FindITK: Use passthru find_package config mode for messagesBrad King2011-04-181-7/+9
| | | | | | | | | | | | | | | | | | | | | The custom error message that mentions PREFIX/lib/InsightToolkit is not accurate for ITKv4. Just use the more generic message that find_package generates by default. This module is now almost a no-op but exists to tell find_package to look for the InsightToolkit name as well as ITK.
* | | Merge topic 'add-svn-trust-cert-to-ExternalProject'Brad King2011-04-192-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | 12a3699 ExternalProject: Always use --non-interactive with svn 3a5a402 ExternalProject: Add SVN_TRUST_CERT argument
| * | | ExternalProject: Always use --non-interactive with svnDavid Cole2011-04-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit added --non-interactive as a "side effect" of turning on SVN_TRUST_CERT. While reviewing that commit, we decided all ExternalProject svn usage should be non-interactive. That way, if there's any sort of problem, svn will return an error right away rather than hang forever waiting for input...
| * | | ExternalProject: Add SVN_TRUST_CERT argumentDavid Cole2011-04-112-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Which adds --non-interactive and --trust-server-cert to the svn checkout and update command lines. This allows ExternalProject clients to pull from an https:// based svn server even though the server may not have a valid or trusted certificate. Caveat emptor: I would NOT recommend using this except as a short-term work-around. Rather, the server should have a valid, trusted certificate, or the client should be using "http" instead of "https".
* | | | Merge topic 'CPackRPM-fix12096'Brad King2011-04-192-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d3fd945 CPackRPM Fix #12096: handle absolute install path with component install
| * | | | CPackRPM Fix #12096: handle absolute install path with component installEric NOULARD2011-04-172-0/+36
| | | | |
* | | | | Merge topic 'improve-debug-trycompile-help-text'Brad King2011-04-192-6/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7f6f606 CMake: Clarify the --debug-trycompile help text
| * | | | | CMake: Clarify the --debug-trycompile help textDavid Cole2011-04-122-6/+13
| | | | | |
* | | | | | Merge topic 'MoreGraphVizFeatures'Brad King2011-04-193-25/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08fa5dd Also generate dependers-graphviz files. 4f96a76 GRAPHVIZ_IGNORE_TARGETS is now a list of regular expressions 5698ad2 Make it possible to exlude external libs from dot files
| * | | | | | Also generate dependers-graphviz files.Alex Neundorf2011-02-063-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this commit, the --graphviz option now also generates dot files which show which other targets depend on some target. So, now there is * a global dot-file which shows all targets and dependencies * a dot file which shows on what a target Foo depends * a dot file which shows which other targets depend on Foo Alex
| * | | | | | GRAPHVIZ_IGNORE_TARGETS is now a list of regular expressionsAlex Neundorf2011-02-052-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar e.g. to CTEST_CUSTOM_WARNING_EXCEPTION from ctest. GRAPHVIZ_TARGET_IGNORE_REGEX is not supported anymore. I hope this is ok, since this was 100% undocumented and can't break a build. Alex
| * | | | | | Make it possible to exlude external libs from dot filesAlex Neundorf2011-02-052-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Christian Ehrlicher. By setting GRAPHVIZ_EXTERNAL_LIBS to TRUE in CMakeGraphVizOptions.cmake you can now exclude external libraries from the produced dot file. I.e. then you see only the dependencies within your project. Alex
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-04-191-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-04-181-1/+1
| |_|/ / / |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-04-171-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-04-161-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-04-151-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-04-141-1/+1
| | | | |
* | | | | KWSys: Remove unused CheckCXXSourceRuns cmake moduleBrad King2011-04-131-62/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This file has not been used in KWSys since commit "Moved test for large file support into kwsysPlatformCxxTests.cxx", 2006-08-25. CMake 2.6.0 and above come with a copy of this module anyway, and KWSys has required CMake 2.6.3 since commit "KWSys: Require at least CMake 2.6.3", 2011-03-01.
* | | | KWSys Nightly Date StampKWSys Robot2011-04-131-1/+1
| |/ / |/| |
* | | Merge topic 'vs10-custom-working-directory-issue-11938'Brad King2011-04-124-15/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 234bae7 VS10: Fix exit code of custom commands with setlocal/endlocal (#11938) b98fdd5 VS: Use setlocal/endlocal only in VS 10 custom commands 06fcbc4 VS10: Fix working directory of consecutive custom commands (#11938)
| * | | VS10: Fix exit code of custom commands with setlocal/endlocal (#11938)Brad King2011-04-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the pattern setlocal ... endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone :cmErrorLevel exit /b %1 :cmDone if %errorlevel% neq 0 goto :VCEnd in custom commands to preserve the %errorlevel% from inside the setlocal/endlocal block.
| * | | VS: Use setlocal/endlocal only in VS 10 custom commandsBrad King2011-04-113-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The setlocal/endlocal and errorlevel pattern added by commit 06fcbc47 (VS10: Fix working directory of consecutive custom commands, 2011-04-08) does not work well in VS 7.1. Restore the original behavior for VS versions that do not need the new behavior.
| * | | VS10: Fix working directory of consecutive custom commands (#11938)Brad King2011-04-084-22/+35
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS 10 msbuild tool uses a single command shell to invoke all the custom command scripts in a project. Isolate the environment and working directory of custom commands using setlocal/endlocal. The form of each command is set errlev= setlocal cd c:\work\dir if %errorlevel% neq 0 goto :cmEnd c: if %errorlevel% neq 0 goto :cmEnd command1 ... if %errorlevel% neq 0 goto :cmEnd ... commandN ... if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & set errlev=%errorlevel% if %errlev% neq 0 goto :VCEnd so that all changes to the environment and working directory are isolated within the script and the return code is preserved.
* | | Merge topic 'CPackDeb-fix12061'Brad King2011-04-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | b22fcfb CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging components
| * | | CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging componentsMartin Konrad2011-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Copy the files specified in CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA to the right directory when packaging components. This fixes #12061. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | Merge topic 'windows-make-working-drive'Brad King2011-04-121-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 42a732b Change working drive only in MinGW Makefiles b567613 Fix working drive of make rules on Windows
| * | | | Change working drive only in MinGW MakefilesBrad King2011-04-081-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit assumed that "cd /d" would work in all Windows shells. While all modern versions of windows have shells that support it, the shells used by NMake and Borland make do not. Borland make does not seem to even support changing drive letters with "d:". Just revert the feature for all make tools except MinGW where the shell is known to support this feature.
| * | | | Fix working drive of make rules on WindowsBrad King2011-04-081-3/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmLocalUnixMakefileGenerator3::CreateCDCommand to change working directories for make tools using a Windows shell using "cd /d" instead of just "cd". This tells the shell to change the current drive letter as well as the working directory on that drive. Commit abaa0267 (When the working directory for a custom command is on another drive..., 2007-12-17) fixed the same problem for VS IDE generators as reported by issue #6150.
* | | | Merge topic 'fixbug_0011782'Brad King2011-04-121-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0378396 UseSWIG.cmake did not support multiple modules and parallel builds
| * | | | UseSWIG.cmake did not support multiple modules and parallel buildsMathieu Malaterre2011-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes BUG: 0011782. UseSWIG would be using the same variable to declare module information. The problem would only be noticed in parallel builds Fix this variable declaration by properly resetting it.
* | | | | Merge topic 'fixbug_0011676'Brad King2011-04-121-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5f76833 Add support for Java on HP
| * | | | | Add support for Java on HPMathieu Malaterre2011-04-081-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | This commit fixes Bug: 0011676 by adding support for version numbering of JRE used on HP: 1.6.0.06-jinteg_20_jan_2010_05_50-b00
* | | | | Merge topic 'fixbug_0011215'Brad King2011-04-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c088536 UseSWIG.cmake does not expand $(OutDir)
| * | | | | UseSWIG.cmake does not expand $(OutDir)Mathieu Malaterre2011-04-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes BUG: 0011215 by properly expanding $(OutDir) Instead of creating the output directory using file(MAKE_DIRECTORY) we use cmake -E to create the directory at execution time
* | | | | Merge topic 'fixbug_0011183'Brad King2011-04-121-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a59d198 Add support for java on fedora
| * | | | | Add support for java on fedoraMathieu Malaterre2011-04-081-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | This commit fixes BUG: 0011183 by adding new paths used on fedora, specifically: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0
* | | | | Merge topic 'fixbug_0010242'Brad King2011-04-121-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4f35488 Add support for FindJava on HP-UX and alpha
| * | | | | Add support for FindJava on HP-UX and alphaMathieu Malaterre2011-04-081-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | This commit fixes BUG: 0010242. It now properly inspect specific directory on hp-ux and alpha implementation of the JRE
* | | | | Merge topic 'fixbug_0004147'Brad King2011-04-121-0/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1088b02 Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake
| * | | | | Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmakeMathieu Malaterre2011-04-081-0/+59
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes BUG: 0004147 it directly uses swig executable to compute a list of dependencies directly from the .i files to make sure to rebuild the swig module any of its direct dep. is touched