summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OS X: Fix Info.plist placement in a CFBundleTim Blechmann2014-03-261-1/+1
| | | | | | | Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the same root directory as the rest of the bundle. Without this, Info.plist was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because the target path was not generated correctly.
* CMake Nightly Date StampKitware Robot2014-03-261-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-251-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-241-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-231-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-221-1/+1
|
* CMake Nightly Date StampKitware Robot2014-03-211-1/+1
|
* Merge branch 'release'Brad King2014-03-200-0/+0
|\
| * Merge branch 'add_custom_command-no-INTERFACE-lib' into releaseBrad King2014-03-196-1/+23
| |\
| * \ Merge branch 'fix-Qt5-non-Windows' into releaseBrad King2014-03-191-1/+1
| |\ \
* | \ \ Merge topic 'watcom-updates'Brad King2014-03-2010-28/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux 5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version 9292d3b8 Watcom: Detect compiler target architecture and platform fbc883c9 Watcom: Add one blank line to Makefile for better readability
| * | | | Watcom: Enable 'WMake Makefiles' generator on LinuxJiri Malak2014-03-173-4/+20
| | | | |
| * | | | Watcom: Introduce OpenWatcom compiler id and fix compiler versionJiri Malak2014-03-175-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Distinguish "Open Watcom" from old "Watcom" by introducing a new "OpenWatcom" compiler id. The __WATCOMC__ format is "VVRP" for Watcom and "VVRP + 1100" for Open Watcom.
| * | | | Watcom: Detect compiler target architecture and platformJiri Malak2014-03-171-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | In CMakePlatformId.h.in, fill ARCHITECTURE_ID and PLATFORM_ID for Open Watcom.
| * | | | Watcom: Add one blank line to Makefile for better readabilityJiri Malak2014-03-171-0/+1
| | | | |
* | | | | Merge topic 'configure_file-unicode'Brad King2014-03-2025-0/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 98383f80 Unicode: check encoding of files given to configure_file.
| * | | | | Unicode: check encoding of files given to configure_file.Clinton Stimpson2014-03-1725-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | UTF-16 and UTF-32 files are rejected.
* | | | | | Merge topic 'ExternalProject-no-download-progress'Brad King2014-03-203-3/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1b953ec Help: Add notes for topic 'ExternalProject-no-download-progress' 7d35b550 ExternalProject: Add option to disable download progress (#14807)
| * | | | | | Help: Add notes for topic 'ExternalProject-no-download-progress'Brad King2014-03-171-0/+6
| | | | | | |
| * | | | | | ExternalProject: Add option to disable download progress (#14807)Brad King2014-03-172-3/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add a DOWNLOAD_NO_PROGRESS option to disable progress reports while downloading source tarballs.
* | | | | | Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2'Brad King2014-03-208-27/+182
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc5a0d8f FindPkgConfig: More unit tests 453d2b24 FindPkgConfig: small refactoring
| * | | | | | FindPkgConfig: More unit testsDaniele E. Domenichelli2014-03-177-3/+151
| | | | | | |
| * | | | | | FindPkgConfig: small refactoringDaniele E. Domenichelli2014-03-171-24/+31
| |/ / / / /
* | | | | | Merge topic 'CheckTypeSize_#14056'Brad King2014-03-203-3/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f857775 CheckTypeSize: Add unit test to cover the no-C case 7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
| * | | | | | CheckTypeSize: Add unit test to cover the no-C caseDaniele E. Domenichelli2014-03-172-0/+6
| | | | | | |
| * | | | | | CheckTypeSize: Support for CXX when C language is not enabledDaniele E. Domenichelli2014-03-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example now works without need to enable C language: cmake_minimum_required(VERSION x.x.x) project(foo CXX) include(CheckTypeSize) check_type_size("short" SIZEOF_SHORT LANGUAGE CXX) Fixes #14056
* | | | | | | Merge topic 'file-DOWNLOAD-cap-progress'Brad King2014-03-201-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 413282c0 file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)
| * | | | | | | file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)Brad King2014-03-171-0/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Curl makes progress callbacks frequently but we round to the nearest percent and report only when that changes so that we make at most 101 progress reports. However, when unexpected data beyond the total are transferred the progress can get beyond 100% and lead to unlimited reports. Avoid this case by capping the reported progress to 100%.
* | | | | | | Merge topic 'minor_cleanups'Brad King2014-03-206-40/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19012b46 cmMakefile: Fix style. 10e6f1e7 cmMakefile: Fix typo in comment. c3a2f78b Makefiles: Remove duplicate code. 2e0611f9 cmGeneratorExpression: Remove unused include. d83ef53a Rename local 'dir_max' variables to 'dir'
| * | | | | | | cmMakefile: Fix style.Stephen Kelly2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this-> for member access.
| * | | | | | | cmMakefile: Fix typo in comment.Stephen Kelly2014-03-171-1/+1
| | | | | | | |
| * | | | | | | Makefiles: Remove duplicate code.Stephen Kelly2014-03-172-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmGlobalUnixMakefileGenerator3::ProgressMapCompare struct is logically equivalent to cmStrictTargetComparison.
| * | | | | | | cmGeneratorExpression: Remove unused include.Stephen Kelly2014-03-171-2/+0
| | | | | | | |
| * | | | | | | Rename local 'dir_max' variables to 'dir'Stephen Kelly2014-03-173-18/+18
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code is not computing the maximum length directory, as is the case in cmLocalVisualStudioGenerator::ComputeLongestObjectDirectory.
* | | | | | | Merge topic 'fix-AllFindModules-test-module-path'Brad King2014-03-201-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf3e87e1 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
| * | | | | | | Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4Brad King2014-03-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindKDE4 module (incorrectly) modifies CMAKE_MODULE_PATH on the caller's behalf. This causes KDE4-installed find modules to be used by the test instead of those in CMake. Teach the test to restore the CMAKE_MODULE_PATH to its original value after each find_package call. This ensures that the next find_package actually tests our module.
* | | | | | | | Merge topic 'add_custom_command-DEPENDS-genex'Brad King2014-03-206-9/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbffccca add_custom_command: Evaluate generator expressions in DEPENDS
| * | | | | | | | add_custom_command: Evaluate generator expressions in DEPENDSStephen Kelly2014-03-206-9/+66
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rely on evaluation in cmCustomCommandGenerator for the generators. When tracing target dependencies, depend on the union of dependencies for all configurations.
* | | | | | | | Merge topic 'Android-platform'Brad King2014-03-201-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77f06b14 Modules: Add an Andriod platform file
| * | | | | | | | Modules: Add an Andriod platform fileStephen Kelly2014-03-201-0/+5
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | It is much like Linux but has no SONAME or RPATH.
* | | | | | | | Merge topic 'fix-out-of-date-CTestTestMemcheck'Brad King2014-03-201-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84a42304 Tests: Prevent unnecessary rebuilds in CTestTestMemcheck
| * | | | | | | | Tests: Prevent unnecessary rebuilds in CTestTestMemcheckDavid Cole2014-03-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeated "cmake . && ninja" calls were resulting in rebuilds every time. Change the test so that it uses "file(WRITE" to generate a ".in" file and then configure_file to "copy if different" that ".in" file to the final generated source file. Now, rebuilds will only occur if there are changes to the generated source file on "cmake ." runs after the first one.
* | | | | | | | | Merge topic 'add_custom_command-no-INTERFACE-lib'Brad King2014-03-206-1/+23
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 2600e923 Disallow INTERFACE libraries with add_custom_command(TARGET).
| * | | | | | | | Disallow INTERFACE libraries with add_custom_command(TARGET).Stephen Kelly2014-03-196-1/+23
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Don't attempt to trace their dependencies.
* | | | | | | | Merge topic 'fix-Qt5-non-Windows'Brad King2014-03-201-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 5f210672 QtDialog: Fix Qt 5 build on non-Windows.
| * | | | | | | QtDialog: Fix Qt 5 build on non-Windows.Stephen Kelly2014-03-191-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain target on Windows, and undefined elsewhere.
* | | | | | | CMake Nightly Date StampKitware Robot2014-03-201-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-03-191-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2014-03-180-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | CMake 3.0.0-rc2v3.0.0-rc2Brad King2014-03-171-1/+1
| | | | | |