summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CPackDeb-help-typo'Brad King2018-01-251-2/+2
|\ | | | | | | | | | | | | 99ba188c CPackDeb: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1697
| * CPackDeb: Fix typo in documentationTobias Svehagen2018-01-241-2/+2
| |
* | Merge topic 'xl-qoptfile'Brad King2018-01-253-4/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | c4dc6485 XL: Enable use of response files for includes and objects e342e410 Makefile,Ninja: Use tool-specific response file flag for include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1691
| * | XL: Enable use of response files for includes and objectsBrad King2018-01-241-0/+2
| | | | | | | | | | | | | | | The IBM XL compiler supports response files via `-qoptfile=<file>` instead of `@<file>`.
| * | Makefile,Ninja: Use tool-specific response file flag for include dirsBrad King2018-01-242-4/+17
| |/ | | | | | | | | | | | | When we use a response file for `-I` flags, not all compilers support the `@<file>` syntax. Define `CMAKE_<LANG>_RESPONSE_FILE_FLAG` to specify tool-specific flag, just as we do for linking already via `CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG`.
* | Merge topic 'fix-cray-pic'Brad King2018-01-255-6/+15
|\ \ | | | | | | | | | | | | | | | | | | b886b46c Cray: Add common PIC flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1692
| * | Cray: Add common PIC flagsChuck Atkins2018-01-245-7/+16
| | | | | | | | | | | | Fixes #17208
* | | Merge topic 'server-polish-opt-handshake'Brad King2018-01-252-18/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 239a3ef8 Server-mode: Document protocol version for optional handshake arguments 9b1a3d24 Server-mode: Rename functions to reflect what they do Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1693
| * | | Server-mode: Document protocol version for optional handshake argumentsTobias Hunger2018-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document which Protocol version only needs the build directory to be passed during a handshake. This is available a bit earlier than that, but from all I can tell 1.2 is the earliest version where that feature is reliably available.
| * | | Server-mode: Rename functions to reflect what they doTobias Hunger2018-01-241-14/+15
| | |/ | |/| | | | | | | | | | Rename the test* static functions to getOrTest* to better reflect what they do now.
* | | Merge topic 'RemoveKDevelop3'Brad King2018-01-2517-753/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 551bd0b3 Generators: adjust error message for the removed KDevelop3 generator 9198e6a2 Generators: remove KDevelop3 generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1688
| * | | Generators: adjust error message for the removed KDevelop3 generatorAlex Neundorf2018-01-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user request a KDevelop3 project, tell the user that KDevelop3 is not supported anymore, so he sees it's not just a typo. Alex
| * | | Generators: remove KDevelop3 generatorAlex Neundorf2018-01-2417-752/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last KDevelop3 release was many years ago, in 2008 I think. I haven't seen or read about anybody using KDevelop 3 since a long time, so I think it can safely be removed from CMake. KDevelop 4 (first released in 2010) has its own proper CMake support now, independent from this generator. Alex
* | | | Merge topic 'update-kwsys'Brad King2018-01-2519-207/+241
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8e89468 Merge branch 'upstream-KWSys' into update-kwsys 7a756570 KWSys 2018-01-23 (0579db1c) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1695
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-01-2419-207/+241
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-01-23 (0579db1c)
| | * | | KWSys 2018-01-23 (0579db1c)KWSys Upstream2018-01-2419-207/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 3e807fd6 cmake: specify source file extensions Brad King (1): 38855ca1 Set CMP0042 explicitly with CMake 3.0 and above Chuck Atkins (1): 4ca97fc6 SystemTools: Disable getpwnam for static linux builds Hans Johnson (1): 7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code Sankhesh Jhaveri (1): 20c458d0 Set CMP0022 policy to new to provide link interface definitions Sean McBride (1): c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes luz.paz (1): 4b67f965 Remove superfluous double whitespace in appropriate places
* | | | | Merge topic 'sourceFile-new-properties'Brad King2018-01-2551-232/+722
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04483111 sourceFile properties: add property INCLUDE_DIRECTORIES 3073bd1f VisualStudio generators: refactoring 78b1c2e0 sourceFile properties: add property COMPILE_OPTIONS 3f935e69 LocalGenerator: refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1596
| * | | | | sourceFile properties: add property INCLUDE_DIRECTORIESMarc Chevrier2018-01-2438-23/+350
| | | | | |
| * | | | | VisualStudio generators: refactoringMarc Chevrier2018-01-237-134/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniformize include directories handling. Fix memory leaks in class cmVisualStudio10TargetGenerator: OptionsMap uses now std::unique_ptr.
| * | | | | sourceFile properties: add property COMPILE_OPTIONSMarc Chevrier2018-01-2315-55/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the support of per-source property COMPILE_OPTIONS, including generator expressions support. Related: #17507
| * | | | | LocalGenerator: refactoringMarc Chevrier2018-01-238-29/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce method AppendCompileOptions to support future source file property COMPILE_OPTIONS.
* | | | | | Merge topic 'fix-include_regular_expression-subdir'Brad King2018-01-255-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d64f9f0 include_regular_expression: Fix propagation to subdirectories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1690
| * | | | | | include_regular_expression: Fix propagation to subdirectoriesBrad King2018-01-245-0/+15
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~321^2 (cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION, 2015-04-04) accidentally broke propagation of the include regex to subdirectories. Refactoring in commit v3.5.0-rc1~319^2~1 (cmState: Initialize properties immediately, 2015-10-07) moved maintenance of this value from `cmMakefile` to `cmStateSnapshot`. Restore propagation of the `INCLUDE_REGULAR_EXPRESSION` to subdirectories and add a test to cover it. Fixes: #17676
* | | | | | Merge topic 'windows-resources-through-link'Brad King2018-01-251-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3b80e86 Windows: Add support for running CMake tools through a symlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1680
| * | | | | | Windows: Add support for running CMake tools through a symlinkPavel P2018-01-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `cmake.exe` is executed through a symlink, `GetModuleFileNameW` will return location of the link instead of the real path of `cmake.exe`. This results in the following error output: CMake Error: Could not find CMAKE_ROOT !!! CMake has most likely not been installed correctly. Use `cmSystemTools::GetRealPath` in `FindCMakeResources` on Windows to resolve any symlink returned by `GetModuleFileNameW`.
* | | | | | | Merge topic 'stdstring'Brad King2018-01-257-30/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25243014 cmMakefile: use std::string in more methods; cleanup c_str()s Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1685
| * | | | | | | cmMakefile: use std::string in more methods; cleanup c_str()sVitaly Stakhovsky2018-01-237-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 969c1f94ae (cmSourceGroup: code improvements; use std::string and C++11 loops, 2017-01-10).
* | | | | | | | CMake Nightly Date StampKitware Robot2018-01-251-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'GenerateExportHeader-include-guard'Brad King2018-01-2422-17/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1ae9aaf GenerateExportHeader: add release notes, tests for include guard changes f4082b0e GenerateExportHeader: add INCLUDE_GUARD_NAME option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1643
| * | | | | | | GenerateExportHeader: add release notes, tests for include guard changesKyle Edwards2018-01-2320-14/+54
| | | | | | | |
| * | | | | | | GenerateExportHeader: add INCLUDE_GUARD_NAME optionKyle Edwards2018-01-232-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #16968.
* | | | | | | | Merge topic 'cpack_trace'Brad King2018-01-245-0/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93bc5848 CPack: accept --trace and --trace-expand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1583
| * | | | | | | | CPack: accept --trace and --trace-expandIsaiah Norton2018-01-235-0/+44
| |/ / / / / / /
* | | | | | | | Merge topic 'UseJava-native-headers-generation'Brad King2018-01-249-17/+211
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4829ea23 add_jar: add option GENERATE_NATIVE_HEADERS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1675
| * | | | | | | | add_jar: add option GENERATE_NATIVE_HEADERSMarc Chevrier2018-01-229-17/+211
| | | | | | | | |
* | | | | | | | | Merge topic 'vcxproj-spaces'Brad King2018-01-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da1a500c cmVisualStudio10TargetGenerator: remove redundant space char in some tags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1684
| * | | | | | | | | cmVisualStudio10TargetGenerator: remove redundant space char in some tagsVitaly Stakhovsky2018-01-231-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Many source tags become identical to those created by MSVC
* | | | | | | | | Merge topic 'generic-inc-sep-typo-remove'Brad King2018-01-243-9/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd3e1600 GenericSystem: Remove misspelled flag default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !1683
| * | | | | | | | GenericSystem: Remove misspelled flag defaultChristian Pfeiffer2018-01-233-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeGenericSystem, it should be ``CMAKE_INCLUDE_SEP_<LANG>`` and not ``CMAKE_INCLUDE_<LANG>_SEP``. However, if the flag is defined, include behavior changes to Java-style non-repeating flags, which isn't intended. Therefore, removing the (misspelled) default initialization should help remove confusion and unintended side effects.
* | | | | | | | | Merge topic 'libuv-restore-fmode'Brad King2018-01-247-18/+27
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98628de8 Extend libuv file translate mode workaround to all executables 3b588ac5 cpack: Enable MSVC debug hook earlier Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1686
| * | | | | | | | Extend libuv file translate mode workaround to all executablesBrad King2018-01-237-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since libuv commit v1.14.1~7 (win: add uv__once_init() calls, 2017-08-30) the libuv initialization of the file translate mode may take place even if we do not use a uv loop. This change was included in our libuv update commit f4a26c748b (libuv 2018-01-19). Therefore use of libuv even through `cmSystemTools::GetRealPath` in any executable may trigger its file translate mode setting. Factor out the logic added to `cmake.exe` by commit v3.9.0-rc4~10^2 (cmake: Fix default file translate mode when using libuv, 2017-06-13) and re-use to initialize all executables. Issue: #16962
| * | | | | | | | cpack: Enable MSVC debug hook earlierBrad King2018-01-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All other executables do this just after console and command-line encoding conversion. Do the same in CPack.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-241-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'recognize-versioned-shared-libraries'Brad King2018-01-231-5/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cbf3653 cmComputeLinkInformation: Better RPATH detection for versioned libraries. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1682
| * | | | | | | | cmComputeLinkInformation: Better RPATH detection for versioned libraries.Byoungchan Lee2018-01-221-5/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some libraries uses the non-conventional SONAME scheme like `libssl.so.1.1` or `libboost_system.so.1.64.0`, but CMake didn't count on such versioned libraries. This commit modify regular expressions to match relaxed format of shared library name for determining various linker options, especially `RPATH`. Note that support for one component has been available since v2.8.12. Fixes: #15938
* | | | | | | | Merge topic 'feature-codelite-fortran'Brad King2018-01-231-15/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51caac69 CodeLite: Better support for Fortran and Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1678
| * | | | | | | CodeLite: Better support for Fortran and WindowsTobias R. Henle2018-01-191-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortran source files are added to the src folder of CodeLite projects and the "Compile Single File" command uses "$(CurrentFileFullName)" instead of "$(CurrentFileName)" with the correct filename extension for object files on windows now.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-01-231-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'autogen-first-line-fix'Brad King2018-01-2218-52/+202
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4e6911b Autogen: Tests: Extend AUTOUIC include patterns test ff91a5d5 Autogen: Tests: Extend AUTOMOC include patterns test a1d491ca Autogen: AUTOMOC/UIC fix for moc/uic include on the first line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1670
| * | | | | | | Autogen: Tests: Extend AUTOUIC include patterns testSebastian Holtermann2018-01-1911-46/+116
| | | | | | | |