summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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-1186-86/+86
| |\ | | | | | | | | | | | | 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 '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 'ep-fix-substitutions'Brad King2011-01-111-10/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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-071-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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-1186-86/+86
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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 '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-112-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5a9e8e7 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
| * | | | | CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)David Cole2011-01-112-3/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Add CPack NSIS MUI_FINISHPAGE_RUN support (#11144)Mike McQuaid2011-01-062-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-0/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'compiler-id-literal-const'Brad King2011-01-043-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dbc79bd Fix constness in compiler id detection
| * | | | Fix constness in compiler id detectionBrad King2010-12-293-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 70c2dc8a (Make compiler id detection more robust, 2008-03-10) we store compiler identification strings in test binaries using the form char* info = "info"; Use the const-correct char const* info = "info"; form instead. This allows the C++ compiler identification to work with "-Werror -Wall" or equivalent flags if the compiler would warn about const-to-non-const conversion.
* | | | Merge topic 'recognize-TI-DSP'Brad King2011-01-043-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f1392dc Recognize the Texas Instruments DSP compiler (#11645)
| * | | | Recognize the Texas Instruments DSP compiler (#11645)Wojciech Migda2010-12-283-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TI DSP compiler predefines "__TI_COMPILER_VERSION__". Use this to identify the C and C++ compilers. For assembler language the C compiler executable is used: $ cl6x -h TMS320C6x C/C++ Compiler v6.1.11 Tools Copyright (c) 1996-2009 Texas Instruments Incorporated Use this command-line option and output to recognize the assembler.
* | | | | Merge topic 'FindBoostTypos'Brad King2011-01-041-184/+189
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5103fe5 Lowercase all function names and improve consistency 97c8f77 Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings.
| * | | | | Lowercase all function names and improve consistencyPhilip Lowman2010-12-281-168/+168
| | | | | |
| * | | | | Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings.Philip Lowman2010-12-281-16/+21
| |/ / / /
* | | | | Merge topic 'add_support_for_windres'Brad King2011-01-046-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 971692c Build enable_language command during bootstrap 960ace1 Add testing for windows resources for mingw/msys/cygwin and remove for watcom. 060d6e8 Add support for windres to cygwin. b2f308c Add support for windows resources with mingw/msys.
| * | | | | Add support for windres to cygwin.Bill Hoffman2010-12-232-1/+3
| | | | | |
| * | | | | Add support for windows resources with mingw/msys.Bill Hoffman2010-12-234-1/+10
| | | | | |
* | | | | | Enable resource building with the intel compiler on windows.Bill Hoffman2011-01-031-0/+4
| |_|_|/ / |/| | | |
* | | | | Merge topic 'bug-11518-dbus-macro'Brad King2010-12-281-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d640d54 allow absolute paths for dbus interface.
| * | | | | allow absolute paths for dbus interface.Clinton Stimpson2010-12-231-1/+9
| | |/ / / | |/| | |
* | | | | Merge topic 'FindBLAS_FindLAPACK'Brad King2010-12-282-13/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51253da FindLAPACK works with C/C++ only projects (issue 0009976) e64b5da fix for Fortran-only projects 1279bd7 find ACML fixes
| * | | | | FindLAPACK works with C/C++ only projects (issue 0009976)Alexey Ozeritsky2010-12-271-11/+11
| | | | | |
| * | | | | fix for Fortran-only projectsAlexey Ozeritsky2010-12-271-1/+9
| | | | | |
| * | | | | find ACML fixesAlexey Ozeritsky2010-12-271-1/+11
| | | | | |
* | | | | | Merge topic 'mac-headerpad_max_install_names-passthru'Brad King2010-12-282-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e498527 Pass Mac linker flag through all compilers with -Wl,
| * | | | | | Pass Mac linker flag through all compilers with -Wl,Brad King2010-12-222-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mac linker defines flag -headerpad_max_install_names but not all front-ends recognize the flag and pass it through (many did in the past, such as the Apple port of GCC). Use the -Wl, option prefix to tell front-ends to pass it through without trying to interpret it.
* | | | | | | Merge topic 'dev/use-fphsa-in-find-opengl'Brad King2010-12-281-4/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 937e369 Use FPHSA in FindOpenGL
| * | | | | | Use FPHSA in FindOpenGLBen Boeckel2010-12-081-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets FindOpenGL to obey the QUIET and REQUIRED options correctly.
* | | | | | | Merge topic 'cygwin'Brad King2010-12-211-1/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85c0a69 Cygwin: Do not define 'WIN32' (#10122) 62c6d2d Merge branch 'cmake_--system-information_min-version' into cygwin 72db20f Merge branch 'tests-if-CYGWIN' into cygwin 5adef16 Merge branch 'cygwin-module-prefix' into cygwin cbc3258 Merge branch 'try-compile-min-version' into cygwin
| * | | | | | | Cygwin: Do not define 'WIN32' (#10122)Brad King2010-12-171-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of Cygwin's goals is to build projects using the POSIX API with no Windows awareness. Many CMake-built projects have been written to test for UNIX and WIN32 but not CYGWIN. The preferred behavior under Cygwin in such projects is to take the UNIX path but not the WIN32 path. Unfortunately this change is BACKWARDS INCOMPATIBLE for Cygwin-aware CMake projects! Some projects that previously built under Cygwin and are Cygwin-aware when they test for WIN32 may now behave differently. Eventually these projects will need to be updated, but to help users build them in the meantime we print a warning about the change in behavior. Furthermore, one may set CMAKE_LEGACY_CYGWIN_WIN32 to request old behavior during the transition. Normally we avoid backwards incompatible changes, but we make an exception in this case for a few reasons: (1) This behavior is preferred by Cygwin's design goals. (2) A warning provides a clear path forward for everyone who may see incompatible behavior, and CMAKE_LEGACY_CYGWIN_WIN32 provides a compatibility option. The warning and compatibility option both disappear when the minimum required version of CMake in a project is sufficiently new, so this issue will simply go away over time as projects are updated to account for the change. (3) The fixes required to update projects are fairly insignificant. Furthermore, the Cygwin distribution has no releases itself so project versions that predate said fixes tend to be difficult to build anyway. (4) This change enables many CMake-built projects that did not previously build under Cygwin to work out-of-the-box. From bug #10122: "I have built over 120 different source packages with (my patched) CMake, including most of KDE4, and have found that NOT defining WIN32 on Cygwin is much more accurate." -- Yaakov Selkowitz A fully compatible change would require patches on top of these project releases for Cygwin even though they otherwise need not be aware of it. (5) Yaakov has been maintaining a fork of CMake with this change for the Cygwin Ports distribution. It works well in practice. By accepting the change in upstream CMake we avoid confusion between the versions. CMake itself builds without WIN32 defined on Cygwin. Simply disable CMAKE_LEGACY_CYGWIN_WIN32 explicitly in our own CMakeLists.txt file.
| * | | | | | | Merge branch 'cmake_--system-information_min-version' into cygwinBrad King2010-12-171-1/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'cmake_--system-information_min-version'Brad King2010-12-211-1/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | a6cb1d4 Declare min CMake version in --system-information project
| * | | | | | | | Declare min CMake version in --system-information projectBrad King2010-12-171-1/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --system-information flag's project triggered a CMP0000 warning because the CMakeLists.txt it generates needs cmake_minimum_required.