summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Remove ancient workaround in LoadCommand testsBrad King2017-10-042-14/+0
|
* Merge branch 'release-3.9'Brad King2017-10-040-0/+0
|\
| * CMake 3.9.4v3.9.4Brad King2017-10-041-1/+1
| |
* | Merge topic 'test-macos-updates'Brad King2017-10-042-3/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | 58d9297e Tests: Fix RunCMake.Framework ios arch for Xcode 9 b8dd7a70 Tests: Fix RunCMake.Framework expected output on macOS 10.13 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1338
| * | Tests: Fix RunCMake.Framework ios arch for Xcode 9Brad King2017-10-031-1/+11
| | | | | | | | | | | | | | | Xcode 9 comes with the iPhoneOS 11.0 SDK that does not support the `armv7` architecture. For this SDK version and newer, use `arm64`.
| * | Tests: Fix RunCMake.Framework expected output on macOS 10.13Brad King2017-10-031-2/+2
| | | | | | | | | | | | | | | | | | The archiver output in the case of universal binaries has changed slightly. Update our expected output to match. While at it, drop unnecessary leading and trailing `.*`.
* | | Merge topic 'vs-no-empty-link-version'Brad King2017-10-041-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0b419b99 VS: Do not emit empty linker Version tag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1332
| * | | VS: Do not emit empty linker Version tagVitaly Stakhovsky2017-10-031-2/+0
| | | | | | | | | | | | | | | | | | | | This empty element does nothing, so simply remove it to simplify generated `.vcxproj` files.
* | | | Merge topic 'compiler-version-internal'Brad King2017-10-049-3/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bdb8cd2 IAR: Detect compiler platform version b96ca728 Add infrastructure to detect secondary compiler version information f952f16d Help: Fix placement of one variable in cmake-variables manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1324
| * | | | IAR: Detect compiler platform versionStefan Andersson2017-10-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `__IAR_SYSTEMS_ICC__` provides additional version information that we need to determine correct usage of the compiler. Extract and store it as `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL`. Issue: #17264
| * | | | Add infrastructure to detect secondary compiler version informationBrad King2017-10-038-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL` variable to hold a secondary/internal compiler version number detected at the same time as the primary compiler version. This will be useful for some compilers where we need such a number to determine correct usage. Inspired-by: Stefan Andersson <tfosm@hotmail.com> Suggested-by: Norbert Lange <norbert.lange@andritz.com> Issue: #17264
| * | | | Help: Fix placement of one variable in cmake-variables manualBrad King2017-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` variable was recently added slightly in the wrong place for the sorted ordering.
* | | | | Merge topic 'src-flags-genex-target'Brad King2017-10-046-8/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 303cd703 VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Nikita Nemkin <nikita@nemkin.ru> Merge-request: !1336
| * | | | | VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS propertyBrad King2017-10-036-8/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This already worked in other generators. Also add a test case. Fixes: #17314
* | | | | CMake Nightly Date StampKitware Robot2017-10-041-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'FindProtobuf-gen-desc'Brad King2017-10-037-11/+137
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 1299f4cc FindProtobuf: add flag to allow descriptor files to be generated 4e91be95 FindProtobuf: Refactor custom command output listing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1301
| * | | FindProtobuf: add flag to allow descriptor files to be generatedPeter Mitrano2017-10-027-4/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The .desc files will be in the same folder as the generated .cc and .h files. - Paths to generate .desc files are stored in a variable passed in - This is only implemented for C++ - Remove legacy ARGS - Add test that generates and uses C++ protobuf message - Add test that checks that the generated .desc file can be instantiated with DynamicMessageFactory - Add Help rst for new feature
| * | | FindProtobuf: Refactor custom command output listingBrad King2017-10-021-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reduce duplication by storing the custom command outputs in variables. Also, since custom command outputs are automatically marked as generated we do not need to do so explicitly.
* | | | CMake Nightly Date StampKitware Robot2017-10-031-1/+1
| |/ / |/| |
* | | Merge topic 'file-path-checksum-cpp11'Brad King2017-10-022-39/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 23ad08dd Migrate cmFilePathChecksum to C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1334
| * | | Migrate cmFilePathChecksum to C++11Sebastian Holtermann2017-10-012-39/+37
| | | |
* | | | Merge topic 'cpack-dmg-explicit-hfs'Brad King2017-10-022-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39b50975 CPack: Fix .dmg HFS+ creation on macOS APFS hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1335
| * | | | CPack: Fix .dmg HFS+ creation on macOS APFS hostsBrad King2017-10-022-2/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | When running `hdiutil create`, specify the HFS+ filesystem explicitly. Otherwise `hdiutil` may choose a filesystem based on the host. We do not want to create APFS images for `.dmg` packages because they may not mount on macOS versions prior to 10.12.
* | | | Merge topic 'DNDGen-stack-var'Brad King2017-10-021-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec30129b CPack: put local variable on the stack Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1331
| * | | | CPack: put local variable on the stackRolf Eike Beer2017-09-291-4/+3
| | | | |
* | | | | Merge topic 'autogen-predefs'Brad King2017-10-0210-5/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bbc1e77 Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 75c98b5e Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 1d7f099d Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1328
| * | | | | Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINESSebastian Holtermann2017-09-291-0/+11
| | | | | |
| * | | | | Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINESSebastian Holtermann2017-09-296-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds the documentation for CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND. Closes #17275
| * | | | | Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINESSebastian Holtermann2017-09-293-5/+10
| | | | | |
* | | | | | Merge topic 'FindBoost-cmake-package'Brad King2017-10-028-3/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c044b9ae FindBoost: Improve messages when a Boost CMake package is found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1330
| * | | | | | FindBoost: Improve messages when a Boost CMake package is foundBrad King2017-09-298-3/+21
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test for this case to verify the messages. This test will also be valuable to cover this code path in which we've had several regressions recently.
* | | | | | Merge topic 'update-kwsys'Brad King2017-10-025-248/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90f1b9ad Merge branch 'upstream-KWSys' into update-kwsys 4532b035 KWSys 2017-09-30 (f108739d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1333
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-09-305-248/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-09-30 (f108739d)
| | * | | | | | KWSys 2017-09-30 (f108739d)KWSys Upstream2017-09-305-248/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit f108739dd90f06787a955212cf475bbbb111252d (master). Upstream Shortlog ----------------- Brad King (1): 41c93d97 Remove unnecessary testIOS Rolf Eike Beer (2): caaef6bb testSystemTools: avoid strcpy() a5046656 SystemTool: remove unused Convert*MacroString()
* | | | | | | | Merge topic 'cuda-9-tests'Brad King2017-10-021-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa640cc2 Tests: Fix CudaOnly.WithDefs test on CUDA 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1329
| * | | | | | | | Tests: Fix CudaOnly.WithDefs test on CUDA 9Brad King2017-09-291-1/+5
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | CUDA 9 dropped support for `compute_20`, so use a different alternative.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-10-021-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-011-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-09-301-1/+1
|/ / / / /
* | | | | Merge topic 'cuda_9_support'Brad King2017-09-292-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | fe37b994 CUDA: Add support for requesting C++98 under CUDA 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1315
| * | | | CUDA: Add support for requesting C++98 under CUDA 9Robert Maynard2017-09-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting in CUDA 9 the default compilation mode is C++14, and you need to explicitly enable C++98/03 mode. While at it, document `14` among the values for `CUDA_STANDARD`. This was accidentally left out of commit v3.9.0-rc1~118^2 (CUDA: Add support for the C++14 standard flag, 2017-05-11).
* | | | | Merge topic 'defer-native-tool'Brad King2017-09-291-9/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8cb9944 Find native build tool after determining the target system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1317
| * | | | | Find native build tool after determining the target systemBrad King2017-09-271-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow toolchain files and platform modules to specify information that affects the selection of the native build tool.
* | | | | | Merge topic 'simplify-generator-parameters'Brad King2017-09-293-20/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29849376 try_compile: Simplify generator platform and toolset propagation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1318
| * | | | | | try_compile: Simplify generator platform and toolset propagationBrad King2017-09-273-20/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to save the `CMAKE_GENERATOR_{PLATFORM,TOOLSET}` values from the cache back into the `cmake` instance. They were used only to propagate the settings into `cmake` instances for `try_compile`, but we already have their values in the `cmMakefile`'s variables anyway. In fact those variables are the ones we actually give to the generators.
* | | | | | Merge topic 'add-vs-shader-properties'Brad King2017-09-297-3/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49dab3eb VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1319
| * | | | | | VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties.Kevin M. Godby2017-09-277-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS_SHADER_OUTPUT_HEADER_FILE property is the name of the generated header file containing the object code of the shader. The VS_SHADER_VARIABLE_NAME property is the name of the variable containing the object code in the above header file. Signed-off-by: Kevin M. Godby <kevin@godby.org>
* | | | | | | Merge topic 'external-project-refactor-ep_get_complete_stampfile'Brad King2017-09-291-5/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da470525 ExternalProject: Refactor code introducing _ep_get_complete_stampfile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1323
| * | | | | | | ExternalProject: Refactor code introducing _ep_get_complete_stampfileJean-Christophe Fillion-Robin2017-09-281-5/+11
| | | | | | | |
* | | | | | | | Merge topic 'FindMatlab-version-quoting'Brad King2017-09-291-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a245f850 FindMatlab: Fix extraction of quoted version number Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1316