summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS10: Escape double quote chars in defines for rc files (#11695)David Cole2011-01-266-12/+35
| | | | | | | | To get rc defines to work in the VS10 IDE requires \" when constructing PreprocessorDefinitions strings. This is different than defines for cl. Also, per-file rc defines were not being generated. Fix that, too.
* VS10: Load projects with obj "source" files (#11147)David Cole2011-01-211-49/+54
| | | | | | | | WriteCLSources should skip source files with "obj" extensions since WriteObjSources has already written them into the vcxproj file. Likewise, WriteGroupSources should skip source files with "obj" extensions to avoid receiving "item ... already exists under the filter" project-load-time error messages from Visual Studio.
* KWSys Nightly Date StampKWSys Robot2011-01-181-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-01-171-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-01-161-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-01-151-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-01-141-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-01-131-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-01-121-1/+1
|
* Merge topic 'resolve/python-versions/policy-CMP0017'Brad King2011-01-112-33/+47
|\ | | | | | | | | | | 784d5ce Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017 2d3594b Python additional version support, bug #10279.
| * Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017Brad King2011-01-1196-139/+311
| |\ | | | | | | | | | | | | Conflicts: Modules/FindPythonInterp.cmake
| * | Python additional version support, bug #10279.Marcus D. Hanwell2011-01-102-33/+47
| | | | | | | | | | | | | | | | | | Introduced an additional variable, Python_ADDITIONAL_VERSIONS, to both FindPythonLibs and FindPythonInterp. Changed FindPythonInterp to loop over versions rather than hardcoding all versions (more like libs).
* | | Merge topic 'improve-findgit'Brad King2011-01-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | ed2b314 Add PATH_SUFFIXES for finding git.
| * | | Add PATH_SUFFIXES for finding git.David Cole2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | This commit makes it automatic to find msysGit installed in its default locations on Windows.
* | | | Merge topic 'doc-LOCATION-property-undefined-behavior'Brad King2011-01-111-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 5734497 Document reading LOCATION_<CONFIG> early as undefined (#11671) 7ffe6d7 Document reading LOCATION early as undefined (#11671)
| * | | | Document reading LOCATION_<CONFIG> early as undefined (#11671)Brad King2011-01-101-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the LOCATION property is for compatibility with CMake 2.4, the LOCATION_<CONFIG> property is modern. However, if a project reads it and sets location-altering properties later the behavior is undefined. See parent commit for details.
| * | | | Document reading LOCATION early as undefined (#11671)Brad King2011-01-101-1/+11
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading the LOCATION target property currently locks down the result and ignores any later changes to properties that affect it. This may or may not be expected and may or may not be the behavior in earlier versions of CMake. The property is documented as provided only for compatibility with CMake 2.4 and alternative interfaces are now available for all originally envisioned use cases. We want to discourage its use without outright deprecating it. Add documentation to explicitly state that reading the property before other properties are set is undefined.
* | | | Merge topic 'ctest-launch-empty-rule'Brad King2011-01-111-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6228abe CTest: Teach launcher to ignore empty/no-op make commands
| * | | | CTest: Teach launcher to ignore empty/no-op make commandsChuck Atkins2011-01-101-0/+7
| | | | |
* | | | | Merge topic 'archive-rule-variables'Brad King2011-01-113-9/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c2d73c9 Allow platform files to set large archive rules (#11674)
| * | | | | Allow platform files to set large archive rules (#11674)Brad King2011-01-103-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit aaa88d33 (Build large archives incrementally, 2008-08-04) hard-coded rules to create static archives incrementally in each language information file. Set each rule conditionally to allow compiler and platform information files to override the language default rules. Inspired-by: Harald Pohl <pohl.h@eppendorf.de>
* | | | | | Merge topic 'build_nightly_from_nightly_branch'Brad King2011-01-112-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | faf1c1e Change the nightly tests to build from the nightly branch and not next.
| * | | | | | Change the nightly tests to build from the nightly branch and not next.Bill Hoffman2011-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make sure that the nightly test matches the dashboard nightly section. When it was next, it used next from when the test was run.
* | | | | | | Merge topic 'ep-fix-substitutions'Brad King2011-01-112-11/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67a513 ExternalProject: Replace location tags in CMAKE_CACHE_ARGS d7a87b5 Merge branch 'ep-log-output-under-vs' into ep-fix-substitutions
| * | | | | | | ExternalProject: Replace location tags in CMAKE_CACHE_ARGSDavid Cole2011-01-072-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we added CMAKE_CACHE_ARGS, we did not try it with any <SOURCE_DIR> or <INSTALL_DIR> references. This commit fixes that accidental omission.
| * | | | | | | Merge branch 'ep-log-output-under-vs' into ep-fix-substitutionsDavid Cole2011-01-071-1/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge topic 'ep-log-output-under-vs'Brad King2011-01-111-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 44aff73 ExternalProject: Avoid bleed-through output when logging.
| * | | | | | | ExternalProject: Avoid bleed-through output when logging.David Cole2011-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset VS_UNICODE_OUTPUT when executing a command whose output is being logged to a file. Previously, running Microsoft tools in sub-processes of Visual Studio would send their output to the Visual Studio output pipe named by this environment variable. Unsetting it forces the output back to the normal stdout and stderr channels where cmake can intercept it and direct it to the appropriate log files.
* | | | | | | | Merge topic 'policy-CMP0017'Brad King2011-01-1192-108/+204
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce28737 Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017 7db8db5 Improve documentation and messages for the new CMP0017 db44848 Prefer files from CMAKE_ROOT when including from CMAKE_ROOT 1e69c6f Merge branch 'user-policy-defaults' into policy-CMP0017 65a0a2a Merge branch 'include-command-whitespace' into policy-CMP0017
| * | | | | | | Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017Alex Neundorf2011-01-0486-86/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This puts the new search behaviour for included files in action, i.e. now when a file from Modules/ include()s another file, it also gets the one from Modules/ included, i.e. the one it expects. Alex
| * | | | | | | Improve documentation and messages for the new CMP0017Alex Neundorf2011-01-043-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch incorporates the comments from Brad: -some improvements to the documentation of CMP0017 -make the test QUIETLY search for zlib
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'include-command-whitespace' into policy-CMP0017Brad King2011-01-042-14/+14
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'user-policy-defaults'Brad King2011-01-115-17/+93
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a364daf Allow users to specify defaults for unset policies 8e45c11 Fix indentation in cmPolicies::ApplyPolicyVersion()
| * | | | | | | | | 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 topic 'include-command-whitespace'Brad King2011-01-112-14/+14
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 75a5221 Remove trailing whitespace
| * | | | | | | | Remove trailing whitespaceAlex Neundorf2011-01-042-14/+14
| |/ / / / / / /
* | | | | | | | Merge topic 'fix_source_groups_for_custom_targets_vs10'Brad King2011-01-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bbab25 Add support for source files in custom targets for VS 10 (Bug#11330).
| * | | | | | | | Add support for source files in custom targets for VS 10 (Bug#11330).Bill Hoffman2011-01-061-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VS10, CMake was not adding the source files that were in the SOURCES list for add_custom_target. This patch fixes that issue.
* | | | | | | | Merge topic 'fix-install-reqd-sys-libs'Brad King2011-01-111-56/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 753b429 InstallRequiredSystemLibraries debug-only (#11141) 492cd84 Add variable for InstallRequiredSystemLibraries dir (#11140) dd5c592 Fix incorrect variable documentation (#11127)
| * | | | | | | | InstallRequiredSystemLibraries debug-only (#11141)Mike McQuaid2011-01-061-51/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to InstallRequiredSystemLibraries to only install debug libraries when both debug and release versions are available. This is as if you are building a debug package then only the debug versions are needed but not the release.
| * | | | | | | | Add variable for InstallRequiredSystemLibraries dir (#11140)Mike McQuaid2011-01-061-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InstallRequiredSystemLibraries currently defaults to installing to bin on WIN32 and lib otherwise. This patch allows you to configure this by using the variable CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION. It also switches the logic to use a single INSTALL(PROGRAMS) command rather than two deprecated uses of the INSTALL_PROGRAMS command.
| * | | | | | | | Fix incorrect variable documentation (#11127)Mike McQuaid2011-01-061-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In InstallRequiredSystemLibraries the documentation details the variable CMAKE_SKIP_INSTALL_RULES to skip installation. This actually doesn't do anything, the variable required is named CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP. This commit amends the documentation to point to the correct variable.
* | | | | | | | Merge topic 'fix-11461-add-midl-vs10'Brad King2011-01-117-4/+174
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e33cbda VSMidl Test: Use correct include_directories with VS6 (#11461) 262da91 Prohibit space in HOME value for VSMidl test. 13caaa3 VS10: Finish Midl support (#11461)
| * | | | | | | | VSMidl Test: Use correct include_directories with VS6 (#11461)David Cole2011-01-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS6 builds put midl output directly in CMAKE_CURRENT_BINARY_DIR. Adjust test include_directories to match. Fixes test failure on dashboard machine DASH3.
| * | | | | | | | Prohibit space in HOME value for VSMidl test.David Cole2011-01-051-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Windows machines actually define HOME in their environment. And some of them actually put a directory with a space in the name as the value. Make sure the HOME value (CMake variable) in this CMakeLists file does not contain a space.
| * | | | | | | | VS10: Finish Midl support (#11461)David Cole2011-01-057-4/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit addresses all of the following: http://public.kitware.com/Bug/view.php?id=8165 http://public.kitware.com/Bug/view.php?id=10687 http://public.kitware.com/Bug/view.php?id=11311 http://public.kitware.com/Bug/view.php?id=11461 With this commit, the midl support for VS10 is as complete as midl support ever was for VS9 and earlier. The VSMidl test should run on all Visual Studio generator based dashboards. CMake no longer sends C++ compiler /D flag values to the midl compiler in Visual Studio generated projects. I think if we want to add that in the future, we should add a way to pass midl compiler specific flags and perhaps an optional way to add in the C++ definitions, too. For now, not sending them along gets past the immediate problem wherein idl files in a CMake VS generated project just didn't work at all. The VSMidl test added in this commit was inspired by the patch attached to 8165. The test had to be modified such that it will run in a directory whose name contains no spaces. There is an existing bug filed against VS10's midl asking Microsoft to fix that problem. But for now, the test added in this commit works by copying the source directory to a location that avoids spaces in the directory names. Inspired-By: Robert Lenhardt
* | | | | | | | | Merge topic 'vs-Fortran-only-DLL'Brad King2011-01-111-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f661b95 VS: Fix linking of Fortran-only DLL projects (#10803)
generated by cgit v0.12 at 2025-01-20 17:50:35 (GMT)