summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2015-08-141-1/+1
|
* Merge branch 'release'Brad King2015-08-130-0/+0
|\
| * CMake 3.3.1v3.3.1Brad King2015-08-131-1/+1
| |
* | Merge topic 'add-link-search-static-properties-defaults'Brad King2015-08-131-0/+9
|\ \ | | | | | | | | | | | | 970a741f Help: Add notes for topic 'add-link-search-static-properties-defaults'
| * | Help: Add notes for topic 'add-link-search-static-properties-defaults'Brad King2015-08-131-0/+9
| | |
* | | Merge topic 'OUTPUT_DIRECTORY-genex'Brad King2015-08-1314-10/+119
|\ \ \ | | | | | | | | | | | | | | | | | | | | d25819bc Add generator expression support to OUTPUT_DIRECTORY target properties e36a05fd cmTarget: Detect and diagnose recursion in GetOutputInfo
| * | | Add generator expression support to OUTPUT_DIRECTORY target propertiesRobert Goulet2015-08-1214-7/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY is set with a genex then do not add the per-config subdirectory on multi-config generators. This will allow projects to use $<CONFIG> to place the per-config part of the directory path somewhere other than the end.
| * | | cmTarget: Detect and diagnose recursion in GetOutputInfoRobert Goulet2015-08-121-3/+21
| | | |
* | | | Merge topic 'FindPkgConfig-capital-messages'Brad King2015-08-131-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 50c9f521 FindPkgConfig: Capitalize first letter of all message()s
| * | | | FindPkgConfig: Capitalize first letter of all message()sChristopher Meng2015-08-121-5/+5
| |/ / / | | | | | | | | | | | | | | | | This makes FindPkgConfig output more formal and more consistent with many other messages produced by CMake.
* | | | Merge topic 'add-link-search-static-properties-defaults'Brad King2015-08-1310-6/+137
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 675ef165 Allow LINK_SEARCH_{START,END}_STATIC props to have default values.
| * | | Allow LINK_SEARCH_{START,END}_STATIC props to have default values.Chuck Atkins2015-08-1310-6/+137
|/ / / | | | | | | | | | | | | | | | Use the CMAKE_LINK_SEARCH_START_STATIC and CMAKE_LINK_SEARCH_END_STATIC variables to initialize the LINK_SEARCH_START_STATIC and LINK_SEARCH_END_STATIC target properties respectively.
* | | Merge topic 'fix-hpux-link-search-shared-flags'Brad King2015-08-131-12/+5
|\ \ \ | | | | | | | | | | | | | | | | dc64d825 HP-UX: Fix linker search type flags for C shared libs on HP-UX
| * | | HP-UX: Fix linker search type flags for C shared libs on HP-UXChuck Atkins2015-08-121-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.7~31^2 (HP: Drive shared library linking with compiler front end, 2011-12-12) the C compiler is used to link shared libraries instead of calling the linker directly, so linker options need to be wrapped as -Wl,-foo instead of -foo.
* | | | Merge branch 'release'Brad King2015-08-130-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'compiler-version-Fortran' into releaseBrad King2015-08-051-0/+1
| |\ \ \
| * \ \ \ Merge branch 'fix-missing-subdir-error' into releaseBrad King2015-08-0411-2/+27
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-xcode-quoting' into releaseBrad King2015-07-311-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ctest-add_subdirectory-crash' into releaseBrad King2015-07-271-1/+1
| |\ \ \ \ \ \
* | | | | | | | CMake Nightly Date StampKitware Robot2015-08-131-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'tests-use-CMAKE_MAKE_PROGRAM'Brad King2015-08-122-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c180f0cb Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test 586b2e5e Tests: Fix CMAKE_MAKE_PROGRAM selection in CMakeOnly tests
| * | | | | | | | Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags testBrad King2015-08-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the explicitly-tested make program, if any.
| * | | | | | | | Tests: Fix CMAKE_MAKE_PROGRAM selection in CMakeOnly testsBrad King2015-08-111-0/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Use the explicitly-tested make program, if any.
* | | | | | | | Merge topic 'FindProtobuf-vs-x64'Brad King2015-08-121-6/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dc6cbcb FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)
| * | | | | | | | FindProtobuf: Search x64 directories in VS-built protobuf source (#14833)A. Joël Lamotte2015-08-111-6/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf 2.6.x and lower do not use CMake (cmake is usable in Protobuf 3.x) but provide legacy Visual Studio projects files. Search their output directories in 64-bit builds.
* | | | | | | | Merge topic 'ExternalProject-hg-clone-without-update'Brad King2015-08-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a77a77a ExternalProject: Tell "hg clone" not to implicitly update
| * | | | | | | | ExternalProject: Tell "hg clone" not to implicitly updateA. Joël Lamotte2015-08-111-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default Mercurial command "clone" will implicitly call "update" with the "default" branch after downloading the cloned repository. However ExternalProject_Add() always generates a second "update" command after cloning with a tag which is either specified or "tip" (equivalent to "default" by default). Therefore ExternalProject will first clone then update to default branch then update to another specified branch if provided. This leads to potentially very long clone operation (in particular when the repository default branch contain subrepos) which can lead to transaction abort triggered by the server. Simply use "hg clone -U" to avoid the implicit update during clone. Our following call to "hg update" will take care of updating anyway.
* | | | | | | | Merge topic 'ctest-report-compiler-version'Brad King2015-08-122-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48c6e7f2 CTest: Report to CDash the compiler version used to build the project
| * | | | | | | | CTest: Report to CDash the compiler version used to build the projectDaniel Pfeifer2015-08-112-3/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler version reported since commit v2.8.2~1018 (CTest-side support for compiler name and compiler version, 2009-10-12) only reported the version of the compiler used to build CMake, and only if it defined "_COMPILER_VERSION". Instead use the version of the compiler used to build the project CTest is testing.
* | | | | | | | Merge topic 'target_include_directories-relative-SYSTEM-dirs'Brad King2015-08-124-10/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c076a8b cmTarget: Remove unused AddSystemIncludeDirectories overload 5790aca4 target_include_directories: Support relative SYSTEM include dirs (#15464)
| * | | | | | | | cmTarget: Remove unused AddSystemIncludeDirectories overloadGregor Jasny2015-08-112-8/+0
| | | | | | | | |
| * | | | | | | | target_include_directories: Support relative SYSTEM include dirs (#15464)Gregor Jasny2015-08-112-2/+28
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2015-08-121-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'bootstrap-no-ninja'Brad King2015-08-112-6/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e3c7725 bootstrap: Do not build Ninja generator
| * | | | | | | bootstrap: Do not build Ninja generatorBrad King2015-08-102-6/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The CMake bootstrap process uses Makefile generators so there is no need to build the Ninja generators during bootstrap.
* | | | | | | Merge topic 'global-generator-makefiles'Brad King2015-08-1110-61/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d8a125e cmQtAutoGenerators: Prefer a generator to access global generator. 5f66900e cmGlobalGenerator: Port Find API to cmMakefile. c5b8841f cmGlobalGenerator: Create global targets from cmMakefiles. 8f75ea3b cmGlobalGenerator: Port global target creation to cmMakefile. 56f0540b cmGlobalGenerator: Port Configure-time check to cmMakefile. 19b546ef cmGlobalGenerator: Base final target property computation on Makefiles. f8be9ba9 cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators. bc1097e3 cmExportLibraryDependenciesCommand: Port to cmMakefile. 204aecdf cmGlobalGenerator: Port configure-time code to cmMakefile. 3dd6f0a5 cmake: Port configure-time code to cmMakefile. 73e4df99 cmGlobalGenerator: Store a container of cmMakefiles. 19369937 cmGeneratorTarget: Port internal type to cmGeneratorTarget. 32f131b0 cmGeneratorTarget: Prefer the local generator to access the global.
| * | | | | | | cmQtAutoGenerators: Prefer a generator to access global generator.Stephen Kelly2015-08-071-2/+2
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Port Find API to cmMakefile.Stephen Kelly2015-08-075-20/+21
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create global targets from cmMakefiles.Stephen Kelly2015-08-071-2/+2
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Port global target creation to cmMakefile.Stephen Kelly2015-08-071-1/+1
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Port Configure-time check to cmMakefile.Stephen Kelly2015-08-071-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses no generate-time state.
| * | | | | | | cmGlobalGenerator: Base final target property computation on Makefiles.Stephen Kelly2015-08-071-2/+2
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.Stephen Kelly2015-08-071-13/+13
| | | | | | | |
| * | | | | | | cmExportLibraryDependenciesCommand: Port to cmMakefile.Stephen Kelly2015-08-071-5/+3
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Port configure-time code to cmMakefile.Stephen Kelly2015-08-071-3/+3
| | | | | | | |
| * | | | | | | cmake: Port configure-time code to cmMakefile.Stephen Kelly2015-08-071-1/+1
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Store a container of cmMakefiles.Stephen Kelly2015-08-073-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For use at configure-time.
| * | | | | | | cmGeneratorTarget: Port internal type to cmGeneratorTarget.Stephen Kelly2015-08-071-6/+6
| | | | | | | |
| * | | | | | | cmGeneratorTarget: Prefer the local generator to access the global.Stephen Kelly2015-08-071-4/+3
| | | | | | | |
* | | | | | | | Merge topic 'use-generator-target'Brad King2015-08-1112-167/+212
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29886ce7 cmTarget: Use a simpler delete algorithm. 197f4de1 cmTarget: Split storage of compile definitions from genexes. 44e071ae cmTarget: Split storage of compile features from genexes. 772ecef4 cmTarget: Split storage of compile options from genexes. 1f54bc1c cmTarget: Split storage of include directories from genexes. 7568199b cmTarget: Request only the link libraries where needed. 10040601 cmLinkImplementationLibraries: Move to namespace scope. d9da6ee2 cmLinkItem: Split to separate file. 27252b24 cmComputeLinkInformation: Simplify generator object access.