summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prefer files from CMAKE_ROOT when including from CMAKE_ROOTAlex Neundorf2011-01-046-22/+118
| | | | | | | | | | | | | | | This patch makes include() and find_package() prefer cmake files located in CMAKE_ROOT over those in CMAKE_MODULE_PATH. This makes sure that the including file gets that file included which it expects, i.e. the one from cmake with which it was tested. It only changes behaviour when such an included file exists both in CMAKE_MODULE_PATH and in CMAKE_ROOT. This comes together with a new policy CMP0017, with default behaviour it behaves as it always did, but warns. With NEW behaviour it includes the file from CMAKE_ROOT instead from CMAKE_MODULE_PATH. This fixes (if CMP0017 is set) building KDE 4.5 with cmake >= 2.8.3. Also a basic test for this policy in included.
* Merge branch 'user-policy-defaults' into policy-CMP0017Brad King2011-01-045-17/+93
|\
| * Allow users to specify defaults for unset policiesBrad King2011-01-045-3/+80
| | | | | | | | | | | | | | | | | | | | Check CMAKE_POLICY_DEFAULT_CMP<NNNN> for a default when policy CMP<NNNN> would otherwise be left unset. This allows users to set policies on the command line when the project does not set them. One may do this to quiet warnings or test whether a project will build with new behavior without modifying code. There may also be cases when users want to build an existing project release using new behavior for policies unknown to the project at the time of the release.
| * Fix indentation in cmPolicies::ApplyPolicyVersion()Alex Neundorf2011-01-041-14/+13
| | | | | | | | Alex
* | Merge branch 'include-command-whitespace' into policy-CMP0017Brad King2011-01-042-14/+14
|\ \ | |/ |/|
| * Remove trailing whitespaceAlex Neundorf2011-01-042-14/+14
|/
* KWSys Nightly Date StampKWSys Robot2010-11-171-1/+1
|
* Merge topic 'EP-extra-generator'David Cole2010-11-161-1/+6
|\ | | | | | | | | 74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
| * BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.Marcus D. Hanwell2010-11-131-1/+6
| | | | | | | | | | This patch fixes the behavior of external projects with respect to generators using the CMAKE_EXTRA_GENERATOR variable.
* | Merge topic 'find-doc-init'David Cole2010-11-1614-42/+88
|\ \ | | | | | | | | | | | | 5303fbf Speedup find_* commands (#11412)
| * | Speedup find_* commands (#11412)Brad King2010-11-1214-42/+88
| |/ | | | | | | | | | | | | Delay computation of the command documentation until it is needed. It is wasteful to do it in the constructor on every call. Inspired-By: Christian Ehrlicher <Ch.Ehrlicher@gmx.de>
* | Merge topic 'cray-compiler'David Cole2010-11-168-0/+50
|\ \ | | | | | | | | | | | | | | | 53e76c8 Teach CMake about Cray C, C++, and Fortran compilers 34e1ac2 Create Fortran info variables for .mod behavior
| * | Teach CMake about Cray C, C++, and Fortran compilersBrad King2010-11-126-0/+14
| | | | | | | | | | | | | | | | | | The Cray Fortran compiler needs "-em" to enable module output and also "-J." to place the .mod files in the current working directory (instead of next to the .o file).
| * | Create Fortran info variables for .mod behaviorBrad King2010-11-122-0/+36
| | | | | | | | | | | | | | | | | | Define CMAKE_Fortran_MODDIR_DEFAULT and CMAKE_Fortran_MODOUT_FLAG variables to help some Fortran compilers generate .mod files in the current working directory.
* | | Merge topic 'MakeCodeBlocksGeneratorNonVerbose2'David Cole2010-11-168-248/+210
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 156ae39 Don't disable colors in the CodeBlocks generator and minor cleanup. e547fa7 Remove the "early alpha stage" comments about Eclipse and C::B a02987a Don't enforce VERBOSE makefiles for the CodeBlocks generator 7b1421b Remove trailing whitespace
| * | | Don't disable colors in the CodeBlocks generator and minor cleanup.Alex Neundorf2010-11-115-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since now the only users of SetToolSupportsColor() are gone, this method is removed too. Alex
| * | | Remove the "early alpha stage" comments about Eclipse and C::BAlex Neundorf2010-11-112-4/+0
| | | | | | | | | | | | | | | | Alex
| * | | Don't enforce VERBOSE makefiles for the CodeBlocks generatorAlex Neundorf2010-11-114-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of enforcing verbose makefile, now the generated build command includes "VERBOSE=1" so the output will be verbose when building in C::B. Also removed the now unused setForceVerboseMakefiles(). Alex
| * | | Remove trailing whitespaceAlex Neundorf2010-11-118-208/+208
| |/ / | | | | | | | | | Alex
* | | Merge topic 'fix-FOLDER-plus-include_external_msproject'David Cole2010-11-162-37/+49
|\ \ \ | | | | | | | | | | | | | | | | b3cf739 Honor FOLDER on include_external_msproject targets (#11436)
| * | | Honor FOLDER on include_external_msproject targets (#11436)David Cole2010-11-102-37/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add FOLDER property usage to the VSExternalInclude test and inspect results manually to verify behavior. Thanks to Jens Auer for the bug report.
* | | | Merge topic 'vs-intel-RuntimeLibrary'David Cole2010-11-163-2/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 22aec40 Set Intel .vfproj RuntimeLibrary attribute 3d79e7d Fix Intel .vfproj SubSystem attribute values
| * | | | Set Intel .vfproj RuntimeLibrary attributeBrad King2010-11-093-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for the "/threads", "/libs:dll", and "/dbglibs" flags and convert them to the proper RuntimeLibrary attribute value in the IDE. This is a 3-to-1 flag mapping and such needs special handling in the parser.
| * | | | Fix Intel .vfproj SubSystem attribute valuesBrad King2010-11-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SubSystem attribute value must be "subSystemConsole" or "subSystemWindows", not "1" or "2". Commit 20f49730 (Reset platform/compiler info status for each language, 2010-09-28) exposed this bug by (correctly) passing the /libs:dll flag to the compiler, which chokes the linker if a value for "/subsystem:" is not given.
* | | | | Merge topic 'FixFindQt3REQUIRED'David Cole2010-11-161-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a39ee97 Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
| * | | | | Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keywordAlex Neundorf2010-11-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | Merge topic 'suppress-dashboard-warnings'David Cole2010-11-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e26f7c Suppress "loop was vectorized" "warnings."
| * | | | | | Suppress "loop was vectorized" "warnings."David Cole2010-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate appearance on dashboard results from Intel compilers.
* | | | | | | Merge topic 'vs8-direct-depends'David Cole2010-11-163-3/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a0c166 Store direct dependencies in solutions for VS >= 8
| * | | | | | | Store direct dependencies in solutions for VS >= 8Brad King2010-09-103-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bc43b0f2 (Do not link library dependencies in VS solutions, 2009-10-20) CMake disables for VS >= 8 linking of a target to libraries that happen to be listed as solution-level dependencies. Therefore we can list the direct dependencies of each target in the solution file and let VS handle transitive dependencies automatically.
* | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-161-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-151-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-141-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-131-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-121-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic '11429_FindGTK2_MSVC10'David Cole2010-11-111-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1321eb9 11429: FindGTK2 does not find libraries built for Visual Studio 2010
| * | | | | | 11429: FindGTK2 does not find libraries built for Visual Studio 2010Philip Lowman2010-11-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for detecting builds of FindGTK2 with Visual Studio 2010. Thanks to Vincent Levesque for the patch.
* | | | | | | KWSys Nightly Date StampKWSys Robot2010-11-111-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-11-101-1/+1
|/ / / / /
* | | | | Merge topic 'fix_osf_build'David Cole2010-11-095-7/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92c082b Add a fix for the inline keyword on the osf os. bd56626 Fixes for the OSF operating system build.
| * | | | | Add a fix for the inline keyword on the osf os.Bill Hoffman2010-09-101-1/+1
| | | | | |
| * | | | | Fixes for the OSF operating system build.Bill Hoffman2010-09-084-6/+19
| | | | | |
* | | | | | Merge topic 'add-cse-contract-test'David Cole2010-11-096-2/+256
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6f3ae5 Update tag in the Contracts/cse-snapshot test. 1e4fd5f Enable overriding contract test timeout values. c81ad34 Add a contract test for building the CSE. 942ace8 Fix contract test so it is not hard coded to the vtk542 test. fd343a1 Add a "Contract" test for VTK. The test downloads and builds VTK.
| * | | | | | Update tag in the Contracts/cse-snapshot test.David Cole2010-10-281-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - allow local variables 'repo' and 'tag' to be overridden by the optional LocalOverrides.cmake - print out STATUS messages to see the variable values in CMake configure output
| * | | | | | Enable overriding contract test timeout values.David Cole2010-10-221-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a longer value as the default timeout (6 hours). For a per-contract-test timeout value, set ${project}_TEST_TIMEOUT in the project's RunTest.cmake file. To use a longer value for all non-specific contract tests, set a CMake cache variable named CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT. All timeout values are in seconds. Also, patch up last commit to defer evaluation of ENV{HOME} until EnforceConfig.cmake is included at ctest time. This allows Windows machines to have "\\" characters in the HOME environment variable if they want to.
| * | | | | | Add a contract test for building the CSE.David Cole2010-10-084-1/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To activate the CSE contract test on a given Linux machine's CMake dashboard, put CMAKE_CONTRACT_PROJECTS:STRING=cse-snapshot in the CMake dashboard's initial cache. The chosen snapshot does not generate subproject dependency info right now. That code was in a previous revision in the CSE's svn repo that apparently has not been merged into the present cse git repository master branch. After that is fixed up in the cse repo, we can update the tag here so that the snapshot built here can run a sub-project based dashboard script. For now, it runs as one big build step, building 'all'.
| * | | | | | Fix contract test so it is not hard coded to the vtk542 test.Bill Hoffman2010-09-212-1/+10
| | | | | | |
| * | | | | | Add a "Contract" test for VTK. The test downloads and builds VTK.Bill Hoffman2010-09-212-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that we can make sure that CMake is staying backwards compatible by testing projects against CMake as the changes are made in CMake. Because these tests will take a long time to run, they will not be enabled by default. Instead, they will be enabled by putting a cache variable into CMake.
* | | | | | | Merge topic 'FindPerlLibs-mac'David Cole2010-11-091-0/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 20ceccc FindPerlLibs: Fix for Mac locally applied patches
| * | | | | | FindPerlLibs: Fix for Mac locally applied patchesDave Abrahams2010-11-081-0/+28
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously FindPerlLibs did not work with the Mac stock Perl because it includes patches. From "perl -V": Locally applied patches: /Library/Perl/Updates/<version> comes before system perl directories installprivlib and installarchlib points to the Updates directory Adjust paths accordingly.
generated by cgit v0.12 at 2025-01-30 11:52:49 (GMT)