summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'testRST-no-preprocessor-FILE'Brad King2014-06-092-3/+10
|\ | | | | | | | | 218699eb Tests: Fix CMakeLib.testRST for relative __FILE__
| * Tests: Fix CMakeLib.testRST for relative __FILE__Brad King2014-06-062-3/+10
| | | | | | | | | | Pass the test input directory as a runtime argument instead of depending on __FILE__ to locate it.
* | Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-12/+14
|\ \ | | | | | | | | | | | | 478b1c8b libarchive: fix compilation on newer HP-UX versions
| * | libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
| | | | | | | | | | | | | | | | | | | | | Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different struct for the timing information. Suggested-by: Eric Berge <ericmberge@gmail.com>
* | | Merge topic 'windows-RC-extension'Brad King2014-06-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 514c2e3d CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension
| * | | CMakeRCCompiler: Handle uppercase 'RC' as resource file format extensionTim Blechmann2014-06-061-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | We already match lowercase 'rc'. Add 'RC' too. The latter is listed in other CMake<LANG>Compiler modules as ignored for their languages already. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | Merge topic 'xcode15-fix-RunCMake-TargetSources'Brad King2014-06-093-5/+8
|\ \ \ | | | | | | | | | | | | | | | | 0366ba5d Tests: Fix RunCMake.TargetSources on Xcode 1.5
| * | | Tests: Fix RunCMake.TargetSources on Xcode 1.5Brad King2014-06-063-5/+8
| |/ / | | | | | | | | | | | | | | | Xcode 1.5 does not support multiple configurations. The generator also adds some sources internally that cause extra OriginDebug output. Update the expected output to tolerate it.
* | | Merge topic 'FindOpenGL-target'Brad King2014-06-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 94770baf FindOpenGL: Fix typo in documented target name
| * | | FindOpenGL: Fix typo in documented target nameBrad King2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We provide "OpenGL::GL", not "OpenGL::OpenGL". Reported-by: Daniel Pfeifer
* | | | Merge topic 'fix-ctest-label-regex'Brad King2014-06-094-2/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 887532f0 CTest: Fix combined inclusive/exclusive label regular expressions
| * | | | CTest: Fix combined inclusive/exclusive label regular expressionsNils Gladitz2014-06-064-2/+58
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-091-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-081-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-071-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'FindOpenGL-target'Brad King2014-06-061-0/+40
|\ \ \ \ | | |/ / | |/| | | | | | | | | | b7804cb6 FindOpenGL: Provide imported targets for GL and GLU
| * | | FindOpenGL: Provide imported targets for GL and GLUPhilipp Möller2014-06-051-0/+40
| | | | | | | | | | | | | | | | | | | | Create OpenGL::GL and OpenGL::GLU imported targets using the locations found.
* | | | Merge topic 'xcode-15-string-apis'Brad King2014-06-061-13/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 23dc6aa1 Xcode: Fix single-configuration generation for version 1.5
| * | | | Xcode: Fix single-configuration generation for version 1.5Brad King2014-06-051-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 84fdc992 (stringapi: Pass configuration names as strings, 2014-02-09) a few code paths for the Xcode 1.5 single-configuration generator were not updated to use an empty configuration name instead of a NULL pointer when no configuration is specified in CMAKE_BUILD_TYPE. Fix them now.
* | | | | Merge topic 'compile-OBJECT_FILE_DIR'Brad King2014-06-064-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8256ccb7 Add OBJECT_FILE_DIR rule placeholder for compilation lines
| * | | | | Add OBJECT_FILE_DIR rule placeholder for compilation linesBrad King2014-06-054-0/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers do not offer an option to specify the path to the object file, but rather only to the directory in which to place the object file. See issue 14876 for some examples. Add a new OBJECT_FILE_DIR placeholder to specify the directory containing the object file for the current compilation. This may differ from the main target OBJECT_DIR when the object corresponds to a source in a subdirectory.
* | | | | Merge topic 'dev/fix-complex-tests'Brad King2014-06-062-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7db77a82 tests: allow RelWithDebInfo and MinSizeRel configs to work
| * | | | | tests: allow RelWithDebInfo and MinSizeRel configs to workBen Boeckel2014-06-052-0/+16
| | | | | |
* | | | | | Merge topic 'watcom-overhaul-notes'Brad King2014-06-062-1/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 559ae189 Help: Add notes about new OpenWatcom compiler id and versioning
| * | | | | Help: Add notes about new OpenWatcom compiler id and versioningBrad King2014-06-052-1/+10
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-06-061-1/+1
|/ / / / /
* | | | | Merge topic 'FindOpenGL-docs'Brad King2014-06-051-18/+24
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | 0496c430 FindOpenGL: Organize and format module documentation
| * | | FindOpenGL: Organize and format module documentationPhilipp Möller2014-06-051-18/+24
| | | |
* | | | Merge topic 'delay-generator-toolset'Brad King2014-06-0521-37/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 528e8af1 Allow a toolchain file to specify a generator toolset 98afb454 VS: Split user- and generator-provided PlatformToolset 3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset
| * | | | Allow a toolchain file to specify a generator toolsetBrad King2014-06-0419-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay use of CMAKE_GENERATOR_TOOLSET until the CMakeSystem.cmake file has been configured and loaded during the first project() or enable_language() command. This gives the toolchain file named by CMAKE_TOOLCHAIN_FILE a chance to set CMAKE_GENERATOR_TOOLSET. This point is still early enough to set the generator toolset prior to the initialization of any languages that might use the toolset. The cmake::GeneratorToolset member variable remains an indication of what was specified by the -T option or loaded from the cache. It does not need to be updated based on the toolchain file setting. The cmMakefile::TryCompile can still pass cmake::GeneratorToolset into the inner instance because the try-compiled project will do platform and language initialization using the CMakeSystem module configured for the outer project. Extend the RunCMake.GeneratorToolset test with cases that use a toolchain file to set CMAKE_GENERATOR_TOOLSET.
| * | | | VS: Split user- and generator-provided PlatformToolsetBrad King2014-06-044-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Divide the cmGlobalVisualStudio10Generator "PlatformToolset" member into two members representing the generator-selected default toolset and the user-specified CMAKE_GENERATOR_TOOLSET value. Prefer the user-specified value, if any, and then fall back to the generator-selected default.
| * | | | Xcode: Rename internal variable {Platform => Generator}ToolsetBrad King2014-06-042-6/+6
| |/ / / | | | | | | | | | | | | The latter matches with CMAKE_GENERATOR_TOOLSET better.
* | | | Merge branch 'release'Brad King2014-06-050-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'fix-ctest-option-summary' into releaseBrad King2014-06-051-1/+2
| |\ \ \
* | \ \ \ Merge topic 'minor-help-cleanup'Brad King2014-06-053-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7eef823e Help: Add comma to assist parsing of ctest_build command docs. 5fb9b16d Help: Document that file(GENERATE) re-writes only when needed. 95135ac3 Help: Add missing external link marker.
| * | | | | Help: Add comma to assist parsing of ctest_build command docs.Stephen Kelly2014-06-051-1/+1
| | | | | |
| * | | | | Help: Document that file(GENERATE) re-writes only when needed.Stephen Kelly2014-06-051-0/+2
| | | | | |
| * | | | | Help: Add missing external link marker.Stephen Kelly2014-06-051-1/+1
| | |_|/ / | |/| | |
* | | | | Merge topic 'fix-ctest-option-summary'Brad King2014-06-051-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | 6446eb09 CTest: Added option description for --output-on-failure
| * | | | CTest: Added option description for --output-on-failureNils Gladitz2014-06-051-1/+2
| | | | | | | | | | | | | | | | | | | | Without it the option list is cut short after --debug.
* | | | | Merge topic 'expand_cobertura_coverage'Brad King2014-06-0510-26/+323
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50daf239 CTest: Generalize Cobertura coverage format handling a2822d30 CTest: Rename coverage implementation for "Python" to "Cobertura"
| * | | | | CTest: Generalize Cobertura coverage format handlingJoseph Snyder2014-06-047-9/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Cobertura coverage files written by Java. Add a test which uses the report from a Java run of Cobertura to calculate coverage. In the documentation of CTEST_COVERAGE_COMMAND, give a sample .sh file to merge the Cobertura .ser files and generate the XML report from the merged file.
| * | | | | CTest: Rename coverage implementation for "Python" to "Cobertura"Joseph Snyder2014-06-045-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The coverage.py tool writes out an XML that conforms to the Cobertura Coverage tool standard. Rename the cmParsePythonCoverage files to instead be cmParseCoberturaCoverage.
* | | | | | Merge topic 'setlocale'Brad King2014-06-054-0/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 730e3862 Encoding: Add setlocale() to applications.
| * | | | | Encoding: Add setlocale() to applications.Clinton Stimpson2014-06-044-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | See also bug #14934 where chinese characters could not be used with cpack.
* | | | | | CMake Nightly Date StampKitware Robot2014-06-051-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release'Brad King2014-06-040-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'fix-build-crash-on-bad-generator' into releaseBrad King2014-06-0310-1/+21
| |\ \ \ \
* | \ \ \ \ Merge topic 'fix-build-crash-on-bad-generator'Brad King2014-06-0410-1/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 44e2923f cmake: Fix --build crash on bad CMAKE_GENERATOR in cache
| * | | | | cmake: Fix --build crash on bad CMAKE_GENERATOR in cacheBrad King2014-06-0310-1/+21
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we fail to create the generator named by CMAKE_GENERATOR, exit with an error message instead of crashing. While at it, fix the wording of the error message when CMAKE_GENERATOR is not set. Extend the RunCMake.CommandLine test with cases covering the "cmake --build" option when the named directory does not provide a CMakeCache.txt with a valid CMAKE_GENERATOR.
generated by cgit v0.12 at 2025-01-25 11:41:37 (GMT)