summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CMakeDetermineVSServicePack-vs-11-update-4'Brad King2014-04-111-41/+17
|\ | | | | | | | | | | | | f0de3f80 CMakeDetermineVSServicePack: Add VS 11 update 4 105658df CMakeDetermineVSServicePack: Match versions more robustly 101515b9 CMakeDetermineVSServicePack: Format documentation
| * CMakeDetermineVSServicePack: Add VS 11 update 4Brad King2014-04-101-1/+3
| |
| * CMakeDetermineVSServicePack: Match versions more robustlyBrad King2014-04-101-31/+7
| | | | | | | | | | | | Use the CMAKE_MATCH_* variables to simplify matching logic. Match either 3 or 4 version components. Do not fail when there are only three components available.
| * CMakeDetermineVSServicePack: Format documentationBrad King2014-04-101-10/+8
| | | | | | | | Also state explicitly that the module is deprecated.
* | Merge topic 'Fortran-pgi-intel-arch'Brad King2014-04-111-0/+4
|\ \ | | | | | | | | | | | | eb8cb2c6 Fortran: Detect pointer size on Intel archs with PGI (#14870)
| * | Fortran: Detect pointer size on Intel archs with PGI (#14870)Brad King2014-04-101-0/+4
| |/ | | | | | | | | The PGI compiler does not define __SIZEOF_POINTER__ so use the __x86_64__ or __i386__ CPU macros to select a pointer size instead.
* | Merge topic 'revert-Android-platform'Brad King2014-04-111-5/+0
|\ \ | | | | | | | | | | | | 4b31f064 Revert "Modules: Add an Andriod platform file"
| * | Revert "Modules: Add an Andriod platform file"Stephen Kelly2014-04-101-5/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 77f06b145d57c4665ff5d71b89a70c54a009ad14. It may be re-added in the future when the requirements for that platform are better known and supported by CMake.
* | | Merge topic 'rc-windres-with-dot'Brad King2014-04-111-5/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7147ed5c CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865) db924e00 CMakeRCInformation: Do not mention 'Fortran' in documentation
| * | | CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)Brad King2014-04-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A 64-bit MinGW windres is named "i686-w64-mingw32.shared-windres". The get_filename_component NAME_WE mode may strip the ".shared-windres" part and cause the result to no longer contain "windres". Instead, match the "windres" name in the full CMAKE_RC_COMPILER value first, and use the get_filename_component code path only for other resource compilers.
| * | | CMakeRCInformation: Do not mention 'Fortran' in documentationBrad King2014-04-111-2/+2
| | |/ | |/| | | | | | | This module is for the Windows Resource Compiler, not Fortran.
* | | Merge topic 'watcom-link-quoting'Brad King2014-04-111-2/+2
|\ \ \ | |_|/ |/| | | | | | | | cb9b1e13 Watcom: Use single quote for all file/path items in wlink command
| * | Watcom: Use single quote for all file/path items in wlink commandJiri Malak2014-04-081-2/+2
| | | | | | | | | | | | | | | | | | Watcom Linker use single quote if necessary for quoting target name, libraries names and libraries search path. Object names were already fixed.
* | | Merge topic 'ExternalProject_VCS-quiet'Brad King2014-04-101-4/+4
|\ \ \ | |/ / |/| | | | | | | | 2dad1c14 ExternalProject: Find VCS packages quietly
| * | ExternalProject: Find VCS packages quietlyDaniele E. Domenichelli2014-04-041-4/+4
| | | | | | | | | | | | | | | This keeps the VCS packages out from FeatureSummary output, unless the INCLUDE_QUIET_PACKAGES is used.
* | | Merge topic 'Qt4Macros-moc-performance'Brad King2014-04-041-2/+2
|\ \ \ | |/ / |/| | | | | | | | 7beba986 Qt4Macros: Make QT4_CREATE_MOC_COMMAND a function
| * | Qt4Macros: Make QT4_CREATE_MOC_COMMAND a functionRobert Maynard2014-04-031-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT4_CREATE_MOC_COMMAND is given a moc_flags argument that contains the COMPILE_DEFINITIONS and a potentially large list of include directories. Since it is a macro, the ${moc_flags} reference is replaced with this content and sent through cmMakefile::ExpandVariablesInString (EVIS). Since commit v3.0.0-rc1~138^2 (Qt4: Use generator expression in COMPILE_DEFINITIONS, 2014-01-13) the COMPILE_DEFINITIONS value contains a '$' so the EVIS fast-path is no longer used. Instead the full cmCommandArgumentParserHelper is now used on the large input, which is very slow (since it was originally created for hand-written code). Change QT4_CREATE_MOC_COMMAND to a function instead of a macro to avoid passing large content through EVIS. This makes it significantly faster.
| * Merge branch 'intel-14-version' into releaseBrad King2014-03-142-2/+10
| |\
* | \ Merge topic 'watcom-platform-module-cleanup'Brad King2014-04-031-23/+27
|\ \ \ | | | | | | | | | | | | | | | | 1e22b23c Watcom: Cleanup Windows-wcl386 configuration
| * | | Watcom: Cleanup Windows-wcl386 configurationJiri Malak2014-04-021-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove Watcom linker caseexact options already defined in system definition. * Use win_dll system for SHARED_LIBRARY and SHARED_MODULE. * Use explicit target definition -bt=.. option for proper initialization of compiler Windows environment (predefined macros) * Reorganize compiler options to global options and configuration specific options * Use option to optimize out stack checking code for release version
* | | | Merge topic 'ExternalProject_exclude-from-all'Brad King2014-04-031-5/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1ddcc582 ExternalProject: Add EXCLUDE_FROM_ALL option to ExternalProject_Add 0a1c0129 ExternalProject: Add EXCLUDE_FROM_MAIN option to ExternalProject_Add_Step
| * | | | ExternalProject: Add EXCLUDE_FROM_ALL option to ExternalProject_AddDaniele E. Domenichelli2014-04-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a new external project, the "all" target will depend on this. This option allows one to add an external project will not be executed when the "all" target is executed. The reason for this is that an external project could be useful, for example, only for running tests, and therefore not necessary during the build.
| * | | | ExternalProject: Add EXCLUDE_FROM_MAIN option to ExternalProject_Add_StepDaniele E. Domenichelli2014-04-011-5/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When adding a new step using ExternalProject_Add_Step, the main target will depend on this step. This option allows one to add a step that will not be executed when the main target for the external project is executed.
* | | | Merge topic 'FindGTest-TEST_P'Brad King2014-04-031-2/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 2e2939c3 FindGTest: Teach GTEST_ADD_TESTS about TEST_P
| * | | FindGTest: Teach GTEST_ADD_TESTS about TEST_PJack Morrison2014-04-011-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the GTEST_ADD_TESTS function would miss parameterized tests because it only considered TEST and TEST_F. Add TEST_P to the list of considered tests and will run all instantiations of this parameterized test together. This is perhaps not as correct as searching for all instantiations of this parameterized test and separating those into separate runs, but this will at least run tests that were previously missing. For reference: https://code.google.com/p/googletest/wiki/Documentation
* | | | Merge topic 'find_package-check-quiet'Brad King2014-04-0129-49/+186
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 83934757 Find*: Make find_package(.. QUIET) affect Check* modules. 4c0cc9ab Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.
| * | | | Find*: Make find_package(.. QUIET) affect Check* modules.Clinton Stimpson2014-03-3013-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues #14812 and #14813 where find_package(OpenMP QUIET) and find_package(Qt4 QUIET) would still print out messages when calling check*() functions. Also a partial fix for #14445 where building CMake (without cmake-gui) when Qt5 is installed and Qt4 is not installed and warnings come out of FindQt4.cmake.
| * | | | Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.Clinton Stimpson2014-03-3016-38/+132
| |/ / / | | | | | | | | | | | | | | | | Setting this flag can silence messages from the Check*.cmake modules. This can be used by Find*.cmake modules when they are in silent mode.
* | | | Merge topic 'hpux-processorcount'Brad King2014-04-011-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c3e238dd ProcessorCount: use mpsched on HPUX if machinfo is not present
| * | | | ProcessorCount: use mpsched on HPUX if machinfo is not presentRolf Eike Beer2014-03-281-0/+12
| |/ / / | | | | | | | | | | | | Co-Author: Gerhard Grimm <gerhard.grimm@detec.com>
* | | | Merge topic 'ExternalProject_GitUpdate'Brad King2014-04-011-7/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f2128d4c ExternalProject: Improve handling of git remote branches ff2451dc ExternalProject: Strip trailing space from git hash
| * | | | ExternalProject: Improve handling of git remote branchesDaniele E. Domenichelli2014-04-011-7/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExternalProject handles git remote branches by commit hash. Due to this, the git repository ends in detached states, and local commits are discarded. Use "git rebase" for remote branches instead of "git checkout". If there are uncommitted changes, use "git stash save/pop" to save changes and restore them after the rebase. If any of these operations fails, try to restore the original status and exit with a fatal error, asking the user to resolve the conflicts manually. This also makes the behaviour of ExternalProject using git more similar to the svn version, and probably more likely to what the user expects by setting GIT_TAG to a branch.
| * | | | ExternalProject: Strip trailing space from git hashDaniele E. Domenichelli2014-04-011-0/+2
| | | | |
* | | | | Merge topic 'link-line-quoting'Brad King2014-04-011-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 423009c1 Makefile: Generate single-quoted object lists for Watcom a863a8fe cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
| * | | | | Makefile: Generate single-quoted object lists for WatcomJiri Malak2014-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile generators. The underlying problem is with the Watcom linker, not with WMake. The Watcom linker wants object files to be single-quoted. Add <LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the generators to use Watcom-style single quotes for object files on link lines. On Windows, Watcom uses the GetCommandLine API to get the original command-line string and do custom parsing that expects single quotes. On POSIX systems, Watcom approximates the original command line by joining all argv[] entries separated by a single space. Therefore we need to double-quote the single-quoted arguments so that the shell does not consume them and they are available for the parser to see.
* | | | | | Merge topic 'UseSWIG-NO_SONAME'Brad King2014-04-011-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | f26147b8 UseSWIG: Enable NO_SONAME on swig modules (#14815)
| * | | | | UseSWIG: Enable NO_SONAME on swig modules (#14815)Julien Schueller2014-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Swig modules are plugins and do not need the SONAME field set.
* | | | | | Merge topic 'threads-cleanup'Brad King2014-03-271-17/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 693f8bf3 FindThreads: simplify checking for SunOS 858ce31f FindThreads: avoid useless checks if a thread library is already found fdf7bd27 FindThreads: replace MATCHES with STREQUAL
| * | | | | FindThreads: simplify checking for SunOSRolf Eike Beer2014-03-251-1/+1
| | | | | |
| * | | | | FindThreads: avoid useless checks if a thread library is already foundRolf Eike Beer2014-03-251-16/+15
| | | | | |
| * | | | | FindThreads: replace MATCHES with STREQUALRolf Eike Beer2014-03-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'dev/find-boost-graph_parallel'Brad King2014-03-261-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f284b003 FindBoost: Search next to MPI libs for graph_parallel (#14832)
| * | | | | FindBoost: Search next to MPI libs for graph_parallel (#14832)Ben Boeckel2014-03-251-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | In addition to the MPI libraries, graph_parallel lives in the MPI libdir as well.
* | | | | Merge topic 'simplify-empty-LDFLAGS'Brad King2014-03-261-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1b18f442 Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is empty
| * | | | | Avoid trailing space in CMAKE_*_LINKER_FLAGS when LDFLAGS is emptyJiri Malak2014-03-241-6/+12
| |/ / / /
* | | | | Merge topic 'FindPkgConfig-stop-on-missing'Brad King2014-03-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 63a4c0af FindPkgConfig: Stop processing when REQUIRED package not found (#14381)
| * | | | | FindPkgConfig: Stop processing when REQUIRED package not found (#14381)Christoph Grüninger2014-03-241-1/+1
| |/ / / / | | | | | | | | | | | | | | | Make the behavior similar to find_package.
* | | | | Merge topic 'haiku-updates'Brad King2014-03-261-11/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cc42b87 Haiku: Fix compiler detection when using distcc 84603d80 Haiku: Enable CMake builtin ELF editor
| * | | | | Haiku: Fix compiler detection when using distccAdrien Destugues2014-03-211-11/+16
| |/ / / / | | | | | | | | | | | | | | | Also remove outdated include directories.
* | | | | Merge topic 'fix-Qt4-moc-commands-depends'Brad King2014-03-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 734df96f Qt4: Fix moc command dependencies for incremental build.
generated by cgit v0.12 at 2024-11-15 03:29:28 (GMT)