summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGlobalGenerator: Cleanup GenerateBuildCommand APIBrad King2013-11-1816-305/+234
| | | | | | | | | All cmGlobalGenerator::GenerateBuildCommand call sites that need to produce a string now generate "cmake --build" commands. The remaining call sites immediately pass the result to cmSystemTools::RunSingleCommand. Avoid the intermediate string and argument parsing by directly producing a vector of strings. Also drop the ignoreErrors argument because no call sites remain that use it.
* cmSystemTools: Add PrintSingleCommand methodBrad King2013-11-152-0/+19
| | | | | Add a method to print a command line for human reference by simply double-quoting every argument.
* cmSystemTools: Add RunSingleCommand overload for std::vector<std::string>Brad King2013-11-152-1/+22
|
* ctest_build: Use "cmake --build" to launch the native build toolBrad King2013-11-151-7/+2
| | | | | | | | | | This avoids requiring cmGlobalGenerator::GenerateBuildCommand to produce a string so that it can be later refactored to produce a vector with no quoting or escaping. It also makes the ctest_build command match what "ctest -T Build" would run in a build tree configured with the new build_command() command behavior. It also ensures that the native build tool used matches that selected by the configuration of the tree to be built.
* build_command: Return a "cmake --build" command-lineBrad King2013-11-156-54/+46
| | | | | | | | | | | | | | Re-implement the build_command() command to use "cmake --build" instead of generating a native build tool invocation directly. This command will internally invoke the proper native build tool. This avoids requiring cmGlobalGenerator::GenerateBuildCommand to produce a string so that it can be later refactored to produce a vector with no quoting or escaping. It will also allow us to later teach CMake to delay the decision about which build tool to invoke until after the project build system is generated to disk. For example, on Visual Studio 10 and above the preferred command-line tool is MSBuild, but we need to fall back to devenv if the .sln has Intel Fortran .vfproj files.
* cmGlobalGenerator: Add method to compute "cmake --build" command lineBrad King2013-11-143-0/+48
| | | | | | Create a GenerateCMakeBuildCommand method to generate a command-line string invoking "cmake --build" for a given target and configuration. Optionally allow the "-i" make flag and additional native options.
* cmGlobalGenerator: Drop unused GenerateBuildCommand implementationBrad King2013-11-141-33/+5
| | | | | | This is a virtual method that is overridden by every generator subclass. The base class implementation should never be called, so replace it with a dummy implementation.
* Merge topic 'doc-tool-options-as-definition-lists'Brad King2013-11-146-417/+527
|\ | | | | | | | | 3442f2b Help: Format manual/*.1.rst options as definition lists
| * Help: Format manual/*.1.rst options as definition listsKitware Robot2013-11-146-417/+527
| | | | | | | | | | Convert the command-line option documentation formatting from bullet lists to definition lists.
* | Merge topic 'gp-ld_library_path'Brad King2013-11-141-2/+4
|\ \ | | | | | | | | | | | | e130b9e GetPrerequisites: Preserve search path order from caller.
| * | GetPrerequisites: Preserve search path order from caller.Clinton Stimpson2013-11-141-2/+4
| |/
* | Merge topic 'openmp-cray'Brad King2013-11-141-4/+5
|\ \ | | | | | | | | | | | | ebf70b0 FindOpenMP: fix detecting compilers that do not need any special flag (#14567)
| * | FindOpenMP: fix detecting compilers that do not need any special flag (#14567)Rolf Eike Beer2013-11-131-4/+5
| | |
* | | Merge topic 'msvc-encoding'Brad King2013-11-141-2/+4
|\ \ \ | | | | | | | | | | | | | | | | 58e3d49 MSVC: Fix encoding of Visual Studio 10+ project files.
| * | | MSVC: Fix encoding of Visual Studio 10+ project files.Clinton Stimpson2013-11-141-2/+4
| | | | | | | | | | | | | | | | | | | | Use Windows-1252, which is the same encoding as older Visual Studio project files.
* | | | Merge topic 'set_emptyvar_PARENT_SCOPE'Brad King2013-11-146-9/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf755c7 set: Add unit tests for set/unset PARENT_SCOPE bc280f1 set: Fix handling of empty value with PARENT_SCOPE 20afbd5 set: Handle value-less PARENT_SCOPE explicitly
| * | | | set: Add unit tests for set/unset PARENT_SCOPEDaniele E. Domenichelli2013-11-135-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Create a RunCMake.set test to cover set() command cases, starting with PARENT_SCOPE.
| * | | | set: Fix handling of empty value with PARENT_SCOPEDaniele E. Domenichelli2013-11-131-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just as set(VAR "") sets VAR to an empty string in the current scope, the code set(VAR "" PARENT_SCOPE) is documented to set the variable to an empty string in the parent scope. Fix the implementation to make it so.
| * | | | set: Handle value-less PARENT_SCOPE explicitlyDaniele E. Domenichelli2013-11-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code "set(VAR PARENT_SCOPE)" unsets VAR in the parent scope. Implement this case explicitly next to where "set(VAR)" is explicitly handled to unset VAR in the current scope.
* | | | | Merge topic 'configure_file-drop-IMMEDIATE'Brad King2013-11-1430-41/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 15610bb Drop use of configure_file IMMEDIATE option
| * | | | | Drop use of configure_file IMMEDIATE optionDaniele E. Domenichelli2013-11-1330-41/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 7d47c693 (Drop compatibility with CMake < 2.4, 2013-10-08) we no longer need to use the configure_file IMMEDIATE option to support compatibility modes less than 2.0.
* | | | | Merge topic 'ExternalData-allow-no-urls'Brad King2013-11-149-6/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8eb20ee ExternalData: Allow local stores without any URL templates
| * | | | | ExternalData: Allow local stores without any URL templatesBrad King2013-11-139-6/+59
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow ExternalData_URL_TEMPLATES to be empty if a value for ExternalData_OBJECT_STORES is provided. Assume in this use case that the object stores will already contain all needed objects. Extend the Module.ExternalData test to cover this case (all objects in stores). Extend the RunCMake.ExternalData test to cover the non-failure message case when stores are provided without URL templates.
* | | | | CMake Nightly Date StampKitware Robot2013-11-141-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cmake-distribution-config'Brad King2013-11-135-24/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 06b0dbe OS X: Drop version number from CMake.app bundle name (#11693) 84af42b Configure NSIS-packaged CMake version and install destination 7655029 Configure NSIS-packaged CMake documentation link in Start Menu
| * | | OS X: Drop version number from CMake.app bundle name (#11693)Brad King2013-11-123-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always name the application bundle "CMake.app". Users can rename it after installation if they wish. This is the typical approach used by OS X applications, including Xcode. It allows CMake to be upgraded without manually re-running CMake in every build tree to update the path to CMake. It also makes the executable location in the CMake build tree more predicatable.
| * | | Configure NSIS-packaged CMake version and install destinationBrad King2013-11-121-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the version number from the default package install destination. An unversioned default allows users to upgrade their CMake installations without manually re-generating all their build trees to update the path to CMake. Users can select a versioned directory name on installation if they wish. Also name the package with the full CMake version number so it is clear exactly what version is going to be installed. This is particularly helpful for the nightly binary installers.
| * | | Configure NSIS-packaged CMake documentation link in Start MenuBrad King2013-11-121-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we use Sphinx to generate the documentation there is a single entry point to link from the start menu. Drop all the (now broken) links to the individual html document pages and provide a single link to the index.html "CMake Documentation" entry point.
* | | | Merge topic 'cmake-copyright-year'Brad King2013-11-137-5/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bade75 Help: Parse Copyright.txt instead of using current year 2bbf6bd Copyright.txt: Add test to check year range 3ee67d0 Copyright.txt: Update year range to end in 2013 621ba1f cmake-gui: Parse Copyright.txt instead of duplicating notice 993b685 bootstrap: Parse Copyright.txt instead of duplicating notice
| * | | | Help: Parse Copyright.txt instead of using current yearBrad King2013-11-132-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure our Sphinx conf.py with a copyright line extracted from Copyright.txt instead of using the year in which the documentation is built. This will future-proof the reported copyright year range when building documentation for old versions.
| * | | | Copyright.txt: Add test to check year rangeBrad King2013-11-122-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a CMake.Copyright test that, when the CMake version number knows the year (as it does in development versions), checks that Copyright.txt has been updated with the current version year.
| * | | | Copyright.txt: Update year range to end in 2013Brad King2013-11-121-1/+1
| | | | |
| * | | | cmake-gui: Parse Copyright.txt instead of duplicating noticeBrad King2013-11-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Set the cmake-gui MACOSX_BUNDLE_COPYRIGHT property by parsing the copyright notice line out of Copyright.txt instead of duplicating it.
| * | | | bootstrap: Parse Copyright.txt instead of duplicating noticeBrad King2013-11-122-2/+5
| |/ / / | | | | | | | | | | | | | | | | Use 'grep' to extract the copyright notice from Copyright.txt instead of duplicating it in the bootstrap script.
* | | | Merge topic 'policy-summary-periods'Brad King2013-11-135-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 49cbca6 CMP0038: Add missing '.' to policy summary line 7390002 CMP0039: Add missing '.' to policy summary line
| * | | | CMP0038: Add missing '.' to policy summary lineBrad King2013-11-121-1/+1
| | | | |
| * | | | CMP0039: Add missing '.' to policy summary lineDaniele E. Domenichelli2013-11-124-4/+4
| | | | |
* | | | | Merge topic 'doc-ExternalData-network-path'Brad King2013-11-131-107/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3883f3 ExternalData: Show example network path URL template ff6818b ExternalData: Format module documentation
| * | | | | ExternalData: Show example network path URL templateBrad King2013-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the ExternalData_URL_TEMPLATES example, add an entry showing how to use the "file://" protocol with a network filesystem path.
| * | | | | ExternalData: Format module documentationBrad King2013-11-121-107/+98
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually revise the .rst format of the documentation. Use inline literal quotes appropriately in paragraph text. Move the :: literal block openers to the end of the preceding paragraphs. Convert the command signature documentation and examples to cmake code-block directives.
* | | | | Merge topic 'create_test_sourcelist-clang-warnings'Brad King2013-11-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ed675a9 create_test_sourcelist: Fix linkage in generated test driver code
| * | | | | create_test_sourcelist: Fix linkage in generated test driver codeSean McBride2013-11-121-2/+2
| |/ / / / | | | | | | | | | | | | | | | Mark private function/global with static linkage.
* | | | | Merge topic 'fix-INTERFACE-with-no-SHARED-libs'Brad King2013-11-134-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 64f73b0 add_library: Fix INTERFACE on platforms with no shared libs (#14561)
| * | | | | add_library: Fix INTERFACE on platforms with no shared libs (#14561)Stephen Kelly2013-11-124-0/+8
| | |/ / / | |/| | |
* | | | | Merge topic 'wix-custom-arguments'Brad King2013-11-133-7/+96
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 096591b CPackWiX: Add variables for custom tool extensions and flags
| * | | | | CPackWiX: Add variables for custom tool extensions and flagsNils Gladitz2013-11-123-7/+96
| | | | | |
* | | | | | Merge topic 'cleanup-edit_cache-target'Brad King2013-11-1313-116/+73
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 684063c Refactor tool selection for edit_cache (#14544) eaf5b7a cmGlobalGenerator: Do not propagate const through GetCMakeInstance
| * | | | | Refactor tool selection for edit_cache (#14544)Brad King2013-11-1213-114/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor edit_cache tool selection to ask each global generator for its preference. Teach the Ninja generator to always use cmake-gui because Ninja by design cannot run interactive terminal dialogs like ccmake. Teach the Makefile generator to use cmake-gui when also using an "extra" generator whose IDE has no terminal to run ccmake, and otherwise fall back to CMAKE_EDIT_COMMAND selection for normal Makefile build systems.
| * | | | | cmGlobalGenerator: Do not propagate const through GetCMakeInstanceBrad King2013-11-121-2/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Combine the const and non-const GetCMakeInstance to a const one and return a pointer to non-const cmake from it.
* | | | | CMake Nightly Date StampKitware Robot2013-11-131-1/+1
|/ / / /