summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindProtobuf: Rename variables to match case of module nameAntonio Perez Barrero2016-03-074-69/+121
| | | | | | | | | | | Use recommended case for variable names. i.e. matching name of the module as passed to `find_package`. For backwards compatibility, the upper case versions of both input and output variables are used and defined when appropriate. Skip this for the _FOUND variable because FPHSA already does it. Skip this for the _VERSION variable because that was recently added and never available with the old name in a release of CMake.
* Merge topic 'BundleUtilities-dylib-in-framework'Brad King2016-03-071-1/+1
|\ | | | | | | | | 3906ca5a BundleUtilities: Fix regression handling frameworks
| * BundleUtilities: Fix regression handling frameworksClinton Stimpson2016-03-071-1/+1
| | | | | | | | | | Fix logic error introduced in commit e422f738 (BundleUtilities: Fix treatment of .dylib inside .framework folders, 2016-02-11).
* | Merge topic 'wix-module-fixes'Brad King2016-03-071-3/+3
|\ \ | | | | | | | | | | | | d4482dd9 CPackWIX: Support binary-only WiX installations
| * | CPackWIX: Support binary-only WiX installationsMarc Chevrier2016-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference in CPACK_WIX_PROPERTY_<PROPERTY> examples. Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | Merge topic 'update-osx-release'Brad King2016-03-073-10/+15
|\ \ \ | | | | | | | | | | | | | | | | b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary
| * | | Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binaryBrad King2016-02-193-10/+15
| | | | | | | | | | | | | | | | | | | | Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.5.
* | | | Merge topic 'vs-vcxproj-ConfigurationType'Brad King2016-03-0710-35/+97
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6122909c VS: Add option to set `ConfigurationType` of a .vcxproj file
| * | | | VS: Add option to set `ConfigurationType` of a .vcxproj fileFabian Otto2016-02-2610-35/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a VS_CONFIGURATION_TYPE target property to set this value explicitly. This is useful to build a Windows Kernel Mode Driver, for example.
* | | | | Merge topic 'enable-ssl-automatically'Brad King2016-03-072-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 190a5fdf Automatically use OpenSSL by default on Linux and FreeBSD if available
| * | | | | Automatically use OpenSSL by default on Linux and FreeBSD if availableBrad King2016-02-292-1/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since https is almost ubiquitous nowadays we should support it by default whenever possible. When building our own curl, we already automatically enable SSL/TLS support on Windows and OS X by using the OS-native APIs. On UNIX platforms we need to use OpenSSL but have not done so by default before, leading to possible user confusion when https transfers fail later. Fix this by searching for OpenSSL quietly and enabling use of it automatically if it is found. Do this only on Linux and FreeBSD for now because on other UNIX platforms (e.g. AIX, HP-UX, SunOS) it seems too easy to find an OpenSSL that is not compatible with the target compiler.
* | | | | CMake Nightly Date StampKitware Robot2016-03-071-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-061-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-051-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-041-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-031-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-021-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-03-011-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-02-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-02-281-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-02-271-1/+1
|/ / /
* | | Merge topic 'compiler-check-message'Brad King2016-02-261-5/+1
|\ \ \ | | | | | | | | | | | | | | | | f3ac0651 Improve compiler check message on non-Make generators
| * | | Improve compiler check message on non-Make generatorsBrad King2016-02-251-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we check for a working compiler we print a message of the form: Check for working <LANG> compiler: ... At one time CMAKE_<LANG>_COMPILER was not well-defined for all generators so we printed the generator name instead of the path to the compiler. Nowadays we always know the compiler, so update the message to print it unconditionally. This is more informative than the generator name, especially when a toolset (cmake -T) is used. Suggested-by: Gregor Jasny <gjasny@googlemail.com>
* | | | Merge topic 'fix_coverage_file_searching'Brad King2016-02-261-2/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bc29ed54 CTest: Make coverage file selection more specific.
| * | | | CTest: Make coverage file selection more specific.Joseph Snyder2016-02-251-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When performing some other testing, the globs for Blanket.js and Delphi code coverage are picking up unintended files. Change the query for the Delphi coverage to follow the naming convention, and check the second line of the found JSON files for certain text before parsing them as coverage files.
* | | | | Merge topic 'try_compile-target-type'Brad King2016-02-2615-15/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7f1bd9fe try_compile: Add option to control type of target
| * | | | | try_compile: Add option to control type of targetBrad King2016-02-1915-15/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_TRY_COMPILE_TARGET_TYPE` option to specify use of `add_library(... STATIC ...)` for the generated test project. This will be useful for cross-compiling toolchains that cannot link a binary without custom flags or scripts.
* | | | | | Merge topic 'file-download-status-hash-mismatch'Brad King2016-02-266-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c9586f9 file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987)
| * | | | | | file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987)Brad King2016-02-256-0/+30
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although we fail with an error on a hash mismatch, it is not a fatal error so the script may continue processing. If the download itself had no error then report in the STATUS variable that the operation was not successful due to the hash mismatch. Suggested-by: Tobias Hieta <tobias@hieta.se>
* | | | | | CMake Nightly Date StampKitware Robot2016-02-261-1/+1
|/ / / / /
* | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-02-251-0/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dc422d27 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)
| * | | | | VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-02-241-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'AddNewEclipseVersions'Brad King2016-02-253-4/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aff38945 Eclipse: only add C/CXX macros if the language is enabled 6ee6b17e Eclipse: add newer version numbers
| * | | | | | Eclipse: only add C/CXX macros if the language is enabledAlex Neundorf2016-02-242-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, the builtin macros and include dirs are only added to the project file if the C/CXX langauges are really enabled. I.e. before this patch the CXX-stuff was in the project file as soon as CXX had been enabled at least once for this build tree. I.e. disabling CXX later on did not remove the CXX macros etc. from the project file (related to #15150) Alex
| * | | | | | Eclipse: add newer version numbersAlex Neundorf2016-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'test-cmake_parse_arguments'Brad King2016-02-252-0/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | 43025124 cmake_parse_arguments: Additional regression tests
| * | | | | | cmake_parse_arguments: Additional regression testsDimitar Yordanov2016-02-242-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add regression tests for the arguments handling in cmake_parse_arguments. The tests were run also against cmake 3.4.1 maint branch to verify that there are no regressions. Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com> Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>
* | | | | | | CMake Nightly Date StampKitware Robot2016-02-251-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2016-02-240-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-typos' into releaseBrad King2016-02-241-5/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'doc-cmake-E-details' into releaseBrad King2016-02-191-4/+8
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'doc-typos'Brad King2016-02-241-5/+5
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | 33507e2a Help: Fix typos in cmake-packages.7 manual
| * | | | | | | Help: Fix typos in cmake-packages.7 manualAshley Whetter2016-02-241-5/+5
| | | | | | | |
* | | | | | | | Merge topic 'CodeBlocksParallelFlag'Brad King2016-02-243-13/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84ccd4f7 CodeBlocks: generate parallel project files (make -j)
| * | | | | | | | CodeBlocks: generate parallel project files (make -j)Alex Neundorf2016-02-233-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done the same way as for Eclipse: cmake tries to determine the number of CPUs, and then adds the respective -jN to the make invocations in the project file. Alex
* | | | | | | | | Merge topic 'xcode-refactor-xcodeobject'Brad King2016-02-242-63/+67
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b860a925 Xcode: Refactor block writes to allow any level of nesting
| * | | | | | | | | Xcode: Refactor block writes to allow any level of nestingRobert Goulet2016-02-242-63/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | | | | Merge topic 'xcode-remove-reftype'Brad King2016-02-241-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 572797f9 Xcode: Write refType only for Xcode 1.5
| * | | | | | | | | | Xcode: Write refType only for Xcode 1.5Gregor Jasny2016-02-241-1/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field is not expected by newer versions.
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2016-02-247-17/+144
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d010ba9f Merge branch 'upstream-KWSys' into update-kwsys a132064b KWSys 2016-02-22 (4847aedd)
generated by cgit v0.12 at 2025-01-07 20:48:29 (GMT)