summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2014-03-057-9/+268
|\ | | | | | | | | | | 7db95df3 Merge branch 'upstream-kwsys' into update-kwsys f096786d KWSys 2014-03-03 (b1916e0a)
| * Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-03-047-9/+268
| |\
| | * KWSys 2014-03-03 (b1916e0a)KWSys Robot2014-03-047-9/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ b1916e0a | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 606d7d6f..b1916e0a Adrien Destugues (1): b1916e0a SystemInformation: Update CPU count code for Haiku Clinton Stimpson (3): 0d8ef429 Encoding: Help enforce the use of wide apis on Windows. cfbc1cc8 FStream: Remove unused basic_filebuf declaration. b3b20cc0 FStream: Add ability to detect BOM. Jiri Malak (1): e66d99b8 SystemTools: Fix compilation with Open Watcom Matt McCormick (1): b3db597b SystemInformation: Mark EXECINFO_LIB as advanced Change-Id: I154a92be7a3ec4c7c12bffbfcd7b50ec7de53c5f
* | | Merge topic 'fix-check-build-system-crash'Brad King2014-03-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 3504f9b9 cmake: Fix --check-build-system argument count check (#14784)
| * | | cmake: Fix --check-build-system argument count check (#14784)Brad King2014-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | This internal option requires two arguments, not just one. Fix the argument count required to recognize the option.
* | | | Merge topic 'doc-host-target-vars'Brad King2014-03-058-26/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 06986afc Help: Update CMAKE_SYSTEM* and CMAKE_HOST_SYSTEM* documentation
| * | | | Help: Update CMAKE_SYSTEM* and CMAKE_HOST_SYSTEM* documentationJiri Malak2014-03-048-26/+32
| | |/ / | |/| | | | | | | | | | | | | | Update to documentation for HOST/TARGET system related variables to be consistent with current functionality.
* | | | Merge topic 'test-external-cmake'Brad King2014-03-0536-326/+329
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9608ef6f Tests: Optionally configure tests exclusively, with an external CMake 9f5bd180 Tests: Drop CMAKE_TEST_GENERATOR(|_TOOLSET) variables 76477267 Tests: Drop CMAKE_TEST_MAKEPROGRAM variable a8a9fb7e Tests: Rename CMAKE_TEST_MAKEPROGRAM uses for explicit make program 40475573 Tests: Rename CMAKE_TEST_MAKEPROGRAM uses for nested test projects f99734b2 Tests: Rename CMAKE_TEST_DEVENV -> CMake_TEST_DEVENV 3c01ee5a Tests: Drop CMAKE_TEST_MSVC and test MSVC directly daf0a5fe Tests: Drop CMAKE_TEST_GENERATOR and CMAKE_TEST_MAKEPROGRAM options e5096312 Tests: Drop kwsys test
| * | | | Tests: Optionally configure tests exclusively, with an external CMakeBrad King2014-03-032-153/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an undocumented CMake_TEST_EXTERNAL_CMAKE option to name an external CMake 'bin' directory. Skip all main CMake binary builds and instead configure the Tests directory to run using the external CMake provided. This will provide a means to exercise the CMake test suite generating for target platforms and compilers with which the CMake source does not build. That will allow us to raise the level of C++ features required of a compiler to build our source while retaining tests for generating projects with older compiler tools.
| * | | | Tests: Drop CMAKE_TEST_GENERATOR(|_TOOLSET) variablesBrad King2014-03-0331-104/+101
| | | | | | | | | | | | | | | | | | | | s/CMAKE_TEST_GENERATOR/CMAKE_GENERATOR/g
| * | | | Tests: Drop CMAKE_TEST_MAKEPROGRAM variableBrad King2014-03-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Remaining uses of the variable simply test its value so use CMAKE_MAKE_PROGRAM directly instead.
| * | | | Tests: Rename CMAKE_TEST_MAKEPROGRAM uses for explicit make programBrad King2014-03-031-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Rename uses of the variable for specifying the make program used to build test projects to CMake_TEST_EXPLICIT_MAKE_PROGRAM.
| * | | | Tests: Rename CMAKE_TEST_MAKEPROGRAM uses for nested test projectsBrad King2014-03-036-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the ExportImport, Fortran, and MacRuntimePath tests the CMAKE_TEST_MAKEPROGRAM variable is used to pass an explicit request for a CMAKE_MAKE_PROGRAM value to be used when building the inner projects. Rename these use cases to CMake_TEST_NESTED_MAKE_PROGRAM.
| * | | | Tests: Rename CMAKE_TEST_DEVENV -> CMake_TEST_DEVENVBrad King2014-03-031-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the convention of naming variables related to the CMake build itself as "CMake_" rather than "CMAKE_". While at it, consolidate the code computing CMake_TEST_DEVENV to be more localized.
| * | | | Tests: Drop CMAKE_TEST_MSVC and test MSVC directlyBrad King2014-03-032-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Now that we no longer support running tests using a different generator we can trust the MSVC platform indicator directly.
| * | | | Tests: Drop CMAKE_TEST_GENERATOR and CMAKE_TEST_MAKEPROGRAM optionsBrad King2014-03-032-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the option to test with a different generator and make program than was used to build. This was used only to test support for the Open Watcom compiler which at one time could not build CMake. Instead we will allow CMake to be configured to skip building binaries and just run the test suite using an external CMake (in a future change). For now leave the two option variables hard-coded to the old option defaults until code can be updated to stop using them.
| * | | | Tests: Drop kwsys testBrad King2014-03-031-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KWSys now has its own dashboard and test clients that run on all the machines where we test CMake. We no longer need a test inside CMake to test KWSys independently.
* | | | | Merge topic 'fix-CMP0017-check'Brad King2014-03-054-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7e187eea CMP0017: Fix check when including from CMake source tree
| * | | | | CMP0017: Fix check when including from CMake source treeBrad King2014-03-044-4/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running CMake from the build tree the CMAKE_ROOT is the entire source tree. Fix the CMP0017 check to be specific to the Modules/ directory under CMAKE_ROOT so that Tests/ does not count. Fix the FindPackageTest modules to include FPHSA by full path from CMAKE_ROOT so that they do not include the local FPHSA which reports an error meant to test that CMP0017 works.
* | | | | Merge topic 'doc-find_package-build-paths'Brad King2014-03-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 69d73d27 Help: Mention in find_package that cmake-gui step is Windows-only (#14781)
| * | | | | Help: Mention in find_package that cmake-gui step is Windows-only (#14781)Brad King2014-03-031-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently used cmake-gui locations are searched only on Windows because the Windows registry is used to record the values. This behavior is historical and may be removed by a policy in the future so rather than implementing it on other platforms simply document the current behavior.
* | | | | Merge topic 'FeatureSummary_combine_WHAT_values'Brad King2014-03-0519-17/+141
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8372b455 FeatureSummary: Add unit tests d348cd1b FeatureSummary: Allow to combine and reorder values for the "WHAT" option
| * | | | | FeatureSummary: Add unit testsDaniele E. Domenichelli2014-03-0318-0/+102
| | | | | |
| * | | | | FeatureSummary: Allow to combine and reorder values for the "WHAT" optionDaniele E. Domenichelli2014-03-031-17/+39
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example it is now possible to do: feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES) That produces an output like: -- -- The following features have been enabled: * Feature1 * Feature2 -- The following features have been disabled: * Feature2 Skipping the lists that are empty. Without this patch this would require to do: message(STATUS "") feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "The following features have been enabled:") feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "The following features have been disabled:") And empty lists would not be skipped. The behaviour when WHAT has a single argument (ALL or any option) is unchanged.
* | | | | CMake Nightly Date StampKitware Robot2014-03-051-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-03-041-1/+1
|/ / /
* | | Merge topic 'add_definitions-no-genex'Brad King2014-03-031-4/+2
|\ \ \ | | | | | | | | | | | | | | | | 1a9316a8 add_definitions: Don't document genex support.
| * | | add_definitions: Don't document genex support.Stephen Kelly2014-03-031-4/+2
| |/ / | | | | | | | | | | | | | | | This command does not support generator expressions. The documentation was mistakenly extended to claim it in commit v3.0.0-rc1~60^2~3 (Help: Mark up the buildsystem commands documentation, 2014-02-03).
* | | Merge topic 'CMP0043-dir-prop'Brad King2014-03-031-1/+7
|\ \ \ | | | | | | | | | | | | | | | | 38df26bc CMP0043: Document old and new interfaces for setting directory property.
| * | | CMP0043: Document old and new interfaces for setting directory property.Stephen Kelly2014-03-031-1/+7
| |/ /
* | | Merge topic 'wix-additions'Brad King2014-03-039-1/+114
|\ \ \ | | | | | | | | | | | | | | | | | | | | 642fa25d CPackWIX: support installation of empty directories 378eb5b7 CPackWIX: Allow Windows Installer property customization
| * | | CPackWIX: support installation of empty directoriesNils Gladitz2014-03-014-0/+47
| | | |
| * | | CPackWIX: Allow Windows Installer property customizationNils Gladitz2014-03-017-1/+67
| | | |
* | | | Merge topic 'FindRuby-2'Brad King2014-03-032-4/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 57abfeaa Help: Add FindRuby-2 topic release notes 165f6430 FindRuby: Add support for Ruby 2.0 and 2.1
| * | | | Help: Add FindRuby-2 topic release notesBrad King2014-02-281-0/+4
| | | | |
| * | | | FindRuby: Add support for Ruby 2.0 and 2.1Bas Couwenberg2014-02-281-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most significant change since Ruby 1.9 is the changed path of config.h, from RbConfig::CONFIG['rubyhdrdir'] to RbConfig::CONFIG['rubyarchhdrdir'].
* | | | | Merge topic 'remove-compatibility-ctest'Brad King2014-03-033-10/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4b67c4b9 Remove compatibility CTest code.
| * | | | | Remove compatibility CTest code.Stephen Kelly2014-02-283-10/+0
| | | | | |
* | | | | | Merge topic 'watcom-wlib-quoting'Brad King2014-03-031-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c5be193 Watcom: Fix static library name quoting for wlib
| * | | | | | Watcom: Fix static library name quoting for wlibJiri Malak2014-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use double-quotes instead of single-quotes around the static library target name in 'wlib' invocations.
* | | | | | | Merge topic 'watcom-dll-no-symbols'Brad King2014-03-031-4/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00503d38 Watcom: Fix creation of DLLs without any exported symbols
| * | | | | | | Watcom: Fix creation of DLLs without any exported symbolsBrad King2014-02-271-4/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create each DLL import library by passing "option implib=..." to the linker for its SHARED library. This works even when there are no symbols to be exported. Leave the option out for MODULE libraries because we do not need an import library for them. For executables, retain the separate invocation of wlib because we want an import library only when the ENABLE_EXPORTS property is set, and in that case the project should provide symbols. Suggested-by: J Decker <d3ck0r@gmail.com>
* | | | | | | Merge topic 'different-python-header-libs-exe-0013794'Brad King2014-03-031-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3816cd2d FindPythonLibs: Find consistent Python interp, headers, libs (#13794)
| * | | | | | | FindPythonLibs: Find consistent Python interp, headers, libs (#13794)Matt McCormick2014-03-031-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When possible, get consistent version of the Python interpreter, headers path, and library. Now find_package(PythonLibs) internally calls find_package(PythonInterp QUIET) and uses the resulting PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR to prefer these versions when looking for the header path and library. The Python_ADDITIONAL_VERSIONS variable has priority over the interpreter version. Co-Author: Adam Wolf Co-Author: Gert Wollny <gw.fossdev@gmail.com>
* | | | | | | | CMake Nightly Date StampKitware Robot2014-03-031-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-03-021-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-011-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'release-aix-access'Brad King2014-02-285-26/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0f2b21d Utilities/Release: Update IBM AIX build machine access 71b14dcb Utilities/Release: Do not upload doc staging tarball
| * | | | | | Utilities/Release: Update IBM AIX build machine accessBrad King2014-02-274-23/+8
| | | | | | |
| * | | | | | Utilities/Release: Do not upload doc staging tarballBrad King2014-02-261-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Restrict the release upload globbing pattern to match the CMake version so that "cmake-<v>*" files go but "cmake-<id>-docs.tar.gz" does not.