summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
| * | | | VS: Fix linking of Fortran-only DLL projects (#10803)Brian Bassett2011-01-061-1/+6
| | | | | | | | | | | | | | | | | | | | Emit the LinkDLL attribute of VFLinkerTool for Fortran DLLs.
* | | | | Merge topic 'improve-build-error-detection'Brad King2011-01-111-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 89eb4bf Improve build error detection.
| * | | | | Improve build error detection.David Cole2011-01-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some were missed recently on a failed dashboard build of ccmake on an HP-UX machine.
* | | | | | Merge topic 'linux-standard-base'Brad King2011-01-112-1/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dde0c89 ccmake: Use LSB 4.0 getmaxyx conditionally a3de30e ccmake: Use LSB 4.0 curses API conditionally 7d691ca ccmake: Port for LSB 4.0 (#11648)
| * | | | | | ccmake: Use LSB 4.0 getmaxyx conditionallyBrad King2011-01-052-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of 'getmaxyx' works on LSB but does not seem portable to other curses versions.
| * | | | | | ccmake: Use LSB 4.0 curses API conditionallyBrad King2011-01-041-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of 'attr_t' and 'wattr_get' works on LSB but does not seem portable to other curses versions.
| * | | | | | ccmake: Port for LSB 4.0 (#11648)Craig Scott2011-01-032-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use getmaxyx instead of getmax[xy]. Avoid using getattrs.
* | | | | | | Merge topic 'fix-test-output-truncation'Brad King2011-01-111-47/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e73bf1c CTest: Do not truncate UTF-8 test output too early (#10656)
| * | | | | | | CTest: Do not truncate UTF-8 test output too early (#10656)Brad King2011-01-041-47/+28
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e4beefeb (CTest: Do not munge UTF-8 output in XML files, 2009-12-08) we validate UTF-8 encoding of build and test output as it is written to XML files. However, in cmCTestTestHandler::CleanTestOutput we still processed test output one byte at a time and did not recognize multi-byte UTF-8 characters. Presence of such characters caused early truncation. Teach CleanTestOutput to truncate test output at the limit but without cutting it in the middle of a multi-byte encoding. Also, stop avoiding truncation in the middle of an XML tag like "<MyElement>" because the '<' and '>' will be properly escaped in the generated XML anyway.
* | | | | | | Merge topic 'qt4-find-plugins'Brad King2011-01-111-9/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6bb8c7 Add support for using static/dynamic Qt plugins.
| * | | | | | | Add support for using static/dynamic Qt plugins.Clinton Stimpson2011-01-011-9/+83
| | | | | | | |
* | | | | | | | Merge topic 'fix-9148-cpack-nsis-installer-root'Brad King2011-01-113-3/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a9e8e7 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
| * | | | | | | | CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)David Cole2011-01-113-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control the root directory of the default directory presented to the end user of an NSIS installer by a CPack variable. Previously, the value used in the NSIS script was $PROGRAMFILES, which is equivalent to the "ProgramFiles" environment variable. That default value is still the same, but now a project may override the value by setting this new variable.
* | | | | | | | | Merge topic 'fix-10644-cpack-menu-links'Brad King2011-01-112-12/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bbe4e6 CPack: Detect more URLs in CPACK_NSIS_MENU_LINKS (#10644)
| * | | | | | | | CPack: Detect more URLs in CPACK_NSIS_MENU_LINKS (#10644)David Cole2011-01-072-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only strings containing "http:" qualified as URLs when found in CPACK_NSIS_MENU_LINKS. Now, we use a regex to detect strings beginning with any of the following: ftp:// ftps:// http:// https:// news:// mailto: This commit also moves the caller of CreateMenuLinks outside the "if (cpackPackageExecutables)" block, allowing clients to use CPACK_NSIS_MENU_LINKS without also having CPACK_PACKAGE_EXECUTABLES defined. That bit of this commit fixes the remainder of the issue described in http://public.kitware.com/Bug/view.php?id=7828 Also, added a set(CPACK_NSIS_MENU_LINKS ...) to the CPackComponents test to enable verifying that all of this actually works.
* | | | | | | | | Merge topic 'cpack-nsis-changes'Brad King2011-01-113-9/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bee514c Add CPack NSIS MUI_FINISHPAGE_RUN support (#11144) 702c8f8 Add CPACK_NSIS_EXECUTABLES_DIRECTORY (#7828) fec3232 Allow NSIS package or uninstall icon (#11143)
| * | | | | | | | | Add CPack NSIS MUI_FINISHPAGE_RUN support (#11144)Mike McQuaid2011-01-063-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MUI_FINISHPAGE_RUN is frequently used with NSIS and provides a checkbox on the finish page of an installer which specifies whether the specified executable should be run when the installer exits. This commit adds support for this setting in CPack.
| * | | | | | | | | Add CPACK_NSIS_EXECUTABLES_DIRECTORY (#7828)Mike McQuaid2011-01-062-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSIS installers default to assuming the executables exist in a directory named "bin" under the installation directory. As this isn't usual for Windows programs, the addition of this variable allows the customization of this directory and links still to be created correctly.
| * | | | | | | | | Allow NSIS package or uninstall icon (#11143)Mike McQuaid2011-01-061-7/+14
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously both CPACK_NSIS_MUI_ICON and CPACK_NSIS_MUI_UNIICON needed to be set for either to take effect. This commit allows either to be set rather than requiring both as users may well want to e.g. use a default uninstall icon but a custom install icon.
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-111-1/+1
| | | | | | | | |
* | | | | | | | | KWSys: Fix WOW64 registry mode on Windows 2000 (#10759)David Cole2011-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit did not compile with mingw gcc. Use the Windows type FARPROC instead of void* for the local variable.
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-101-1/+1
| | | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-091-1/+1
| | | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-081-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Fix WOW64 registry mode on Windows 2000 (#10759)David Cole2011-01-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake fails to find any registry paths on Windows 2000: according to regmon it fails with an access denied error. I double checked all the access rights and they are fine. After checking the access modes on MSDN I found that it says KEY_WOW64_32KEY / KEY_WOW64_64KEY are not supported on Windows 2000. CMake does not check if the current system supports Wow64 before applying these flags. This commit adds a check for IsWow64Process in kernel32.dll before adding these flags. Author: Axel Gembe <ago@bastart.eu.org> Signed-off-by: Axel Gembe <ago@bastart.eu.org>
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-071-1/+1
|/ / / / / / /
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-061-1/+1
| | | | | | |
* | | | | | | KWSys: Retrieve QNX specific memory and processor info (#11329)David Cole2011-01-051-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Rolf Eike Beer <eike@sf-mail.de> 2010-10-18 12:03:39