summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | Autogen: Tests: Extend AUTOMOC include patterns testSebastian Holtermann2018-01-186-2/+82
| | | | | |
| * | | | | Autogen: AUTOMOC/UIC fix for moc/uic include on the first lineSebastian Holtermann2018-01-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moc/uic include was found on the first line of a file it was ignored. This fixes the issue by extending the regular expression for include detection. Closes #17655
* | | | | | Merge topic 'boost-optional-components'Brad King2018-01-225-4/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2557cad5 FindBoost: support OPTIONAL_COMPONENTS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Paul "TBBle" Hampson <paul.hampson@pobox.com> Merge-request: !1660
| * | | | | | FindBoost: support OPTIONAL_COMPONENTSSergiu Deitsch2018-01-195-4/+71
| | | | | | |
* | | | | | | Merge topic 'serverCrashIfNoMinVersionSpecified'Brad King2018-01-221-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33802b31 server: fix crash if no min version specified Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1673
| * | | | | | server: fix crash if no min version specifiedJustin Goshi2018-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a CMakeLists.txt file doesn't contain cmake_minimum_required then the server was crashing. The root cause was the json object model does not support null and was crashing. Add the null check and use an empty string in this case.
* | | | | | | Merge topic 'update-libuv'Brad King2018-01-2263-1019/+2804
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6db7b352 libuv: Update build within CMake b58d48c1 Merge branch 'upstream-libuv' into update-libuv f4a26c74 libuv 2018-01-19 (63de1eca) e8b57c22 libuv: Teach import script to add missing newlines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1666
| * | | | | | | libuv: Update build within CMakeBrad King2018-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our CMake build rules to account for upstream changes.
| * | | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2018-01-1961-1018/+2800
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2018-01-19 (63de1eca)
| | * | | | | | | libuv 2018-01-19 (63de1eca)libuv upstream2018-01-1962-1019/+2806
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit 63de1ecad3252d3e9ed2fe960c21d9387615fa45 (v1.x).
| * | | | | | | | libuv: Teach import script to add missing newlinesBrad King2018-01-161-0/+2
| | | | | | | | |
* | | | | | | | | Merge topic 'FindJava-jdk-10'Brad King2018-01-221-9/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c08d207 FindJava: ignore javah for JDK 10, it has been removed Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1637
| * | | | | | | | | FindJava: ignore javah for JDK 10, it has been removedStefan Brüns2018-01-191-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The standalone javah tool has been removed, header generation happens during execution of javac. `javac -h` allows generation of headers only. See http://openjdk.java.net/projects/jdk/10/ and http://openjdk.java.net/jeps/313 for details. Fixes: #17613
* | | | | | | | | | Merge topic 'FindPythonInterp-windows-current-user'Brad King2018-01-221-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7d344be FindPythonInterp: support single-user installs on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1674
| * | | | | | | | | | FindPythonInterp: support single-user installs on WindowsWerner Palfinger2018-01-191-0/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake currently searches in HKEY_LOCAL_MACHINE. According to PEP 514, single-user installs are registered in HKEY_CURRENT_USER See also FindPythonLibs.cmake
* | | | | | | | | | Merge topic 'genex-output-known-extension'Brad King2018-01-221-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c525c84 genex: generated files have known extensions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1669
generated by cgit v0.12 at 2025-01-24 12:47:24 (GMT)