mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
38,581 Commits 2 Branches 401 Tags
2c6f5baaa7e101cdd3e5769a3fd8d49d0501b8e6
Commit Graph

38581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot 2c6f5baaa7 CMake Nightly Date Stamp 2018-01-23 00:01:18 -05:00
Brad King b058d92b33 Merge topic 'autogen-first-line-fix' 
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
 2018-01-22 10:23:41 -05:00
Brad King 5d13fa1010 Merge topic 'boost-optional-components' 
2557cad5 FindBoost: support OPTIONAL_COMPONENTS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Paul "TBBle" Hampson <paul.hampson@pobox.com>
Merge-request: !1660
 2018-01-22 10:20:53 -05:00
Brad King de9c3d7964 Merge topic 'serverCrashIfNoMinVersionSpecified' 
33802b31 server: fix crash if no min version specified

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1673
 2018-01-22 10:19:28 -05:00
Brad King 63f263b27f Merge topic 'update-libuv' 
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
 2018-01-22 10:18:44 -05:00
Brad King c81ace7ab7 Merge topic 'FindJava-jdk-10' 
3c08d207 FindJava: ignore javah for JDK 10, it has been removed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1637
 2018-01-22 10:18:15 -05:00
Brad King 2a9614039e Merge topic 'FindPythonInterp-windows-current-user' 
a7d344be FindPythonInterp: support single-user installs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1674
 2018-01-22 10:17:25 -05:00
Brad King a629c338a1 Merge topic 'genex-output-known-extension' 
7c525c84 genex: generated files have known extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1669
 2018-01-22 10:16:16 -05:00
Brad King 1f35d3f20a Merge topic 'heading_automoc_macro_names' 
c89c87c9 Help: Fix heading level for CMAKE_AUTOMOC_MACRO_NAMES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1671
 2018-01-22 10:13:01 -05:00
Brad King 856dc73e02 Merge topic 'docs_cmake_crosscompiling' 
60febda4 Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1672
 2018-01-22 10:12:21 -05:00
Brad King 6ab316c98d Merge topic 'iwyu' 
e720a343 IWYU: Add more workaround mappings for internal bits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1681
 2018-01-22 10:07:47 -05:00
Brad King e720a34399 IWYU: Add more workaround mappings for internal bits 
Extend our hack section of mappings to work around IWYU incorrectly
requiring:

* bits/stdint-uintn.h for stdint.h
* bits/stdint-intn.h for stdint.h
* bits/types/mbstate_t.h for wchar.h
 2018-01-22 09:56:30 -05:00
Christian Pfeiffer c2bed75ebe Merge topic 'findopenmp-genex' 
ffa6f875 FindOpenMP: Employ genex where possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1676
 2018-01-22 09:17:06 -05:00
Kitware Robot 5c3c70201d CMake Nightly Date Stamp 2018-01-22 00:01:08 -05:00
Kitware Robot 17c3e418b0 CMake Nightly Date Stamp 2018-01-21 00:01:06 -05:00
Craig Scott eae7718440 Merge topic 'docs_cmake_lang_compiler_external_toolchain' 
f3e9bedd Help: CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN typo removal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1679
 2018-01-20 17:56:05 -05:00
Craig Scott 11c4ea7f11 Merge topic 'reword-cmake-E-time-help' 
73bb781d Help: Reword misleading docs for cmake -E time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1677
 2018-01-20 17:54:24 -05:00
Craig Scott f3e9beddfb Help: CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN typo removal 2018-01-20 17:17:28 +11:00
Kitware Robot ab1be08913 CMake Nightly Date Stamp 2018-01-20 00:01:11 -05:00
Taylor Braun-Jones 73bb781df0 Help: Reword misleading docs for cmake -E time 2018-01-19 16:07:39 -05:00
Sebastian Holtermann b4e6911bf5 Autogen: Tests: Extend AUTOUIC include patterns test 2018-01-19 19:21:12 +01:00
Brad King 6db7b35236 libuv: Update build within CMake 
Update our CMake build rules to account for upstream changes.
 2018-01-19 13:03:12 -05:00
Brad King b58d48c15f Merge branch 'upstream-libuv' into update-libuv 
* upstream-libuv:
  libuv 2018-01-19 (63de1eca)
 2018-01-19 13:03:04 -05:00
libuv upstream f4a26c748b libuv 2018-01-19 (63de1eca) 
Code extracted from:

    https://github.com/libuv/libuv.git

at commit 63de1ecad3252d3e9ed2fe960c21d9387615fa45 (v1.x).
 2018-01-19 13:03:03 -05:00
Stefan Brüns 3c08d2075f FindJava: ignore javah for JDK 10, it has been removed 
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
 2018-01-19 11:15:11 -05:00
Sergiu Deitsch 2557cad5ec FindBoost: support OPTIONAL_COMPONENTS 2018-01-19 17:00:44 +01:00
Christian Pfeiffer ffa6f8752b FindOpenMP: Employ genex where possible 
Fixes: #17610
 2018-01-19 16:38:52 +01:00
Brad King 927c603574 Merge topic 'FindOpenGL-fix-typo' 
c2aec683 FindOpenGL: remove duplicate OpenGL::GL reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1668
 2018-01-19 10:08:42 -05:00
Brad King e68a269cd2 Merge topic 'cache-truncate-newlines' 
c42b377c cmCacheManager: Test and document newline truncation behavior
a9c48307 cmCacheManager: Truncate values containing newlines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1652
 2018-01-19 10:08:06 -05:00
Werner Palfinger a7d344be71 FindPythonInterp: support single-user installs on Windows 
CMake currently searches in HKEY_LOCAL_MACHINE. 
According to PEP 514, single-user installs are registered in HKEY_CURRENT_USER
See also FindPythonLibs.cmake
 2018-01-19 06:13:03 -05:00
Kitware Robot be2f050903 CMake Nightly Date Stamp 2018-01-19 00:01:23 -05:00
Justin Goshi 33802b3168 server: fix crash if no min version specified 
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.
 2018-01-18 20:54:02 -08:00
Craig Scott c89c87c9be Help: Fix heading level for CMAKE_AUTOMOC_MACRO_NAMES 2018-01-19 08:31:48 +11:00
Craig Scott 60febda455 Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING 
Fixes: #17653
 2018-01-19 08:31:34 +11:00
Sebastian Holtermann ff91a5d54b Autogen: Tests: Extend AUTOMOC include patterns test 2018-01-18 18:38:45 +01:00
Sebastian Holtermann a1d491ca27 Autogen: AUTOMOC/UIC fix for moc/uic include on the first line 
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
 2018-01-18 18:37:49 +01:00
Ben Boeckel 7c525c8416 genex: generated files have known extensions 2018-01-18 11:11:19 -05:00
Ben Boeckel c2aec68333 FindOpenGL: remove duplicate OpenGL::GL reference 2018-01-18 11:10:13 -05:00
Brad King cbe7314bb0 Merge branch 'release-3.10' 2018-01-18 10:59:17 -05:00
Brad King c1e087a9d3 CMake 3.10.2 v3.10.2 2018-01-18 09:53:18 -05:00
Brad King c1ea96d04c Merge topic 'autogen-parallel' 
9cfa213a Autogen: Rename cmQtAutogeneratorInitializer to cmQtAutoGenInitializer
79908ae4 Autogen: Add release notes for (CMAKE_)AUTOGEN_PARALLEL
45ee4979 Autogen: Add documentation for (CMAKE_)AUTOGEN_PARALLEL
6f4b6613 Autogen: Tests: Add AUTOGEN_PARALLEL tests
a008578d Autogen: Process files concurrently in AUTOMOC and AUTOUIC
488baaf0 Autogen: Tests: Fix MocInclude test(s)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1632
 2018-01-18 09:46:29 -05:00
Brad King 84e2a7e58a Merge topic 'ctest-libuv-output-decode' 
a6e9b9c9 CTest: Fix process output read error cases
c10119df CTest: Fix decoding of MBCS character split by buffering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1667
 2018-01-18 09:43:08 -05:00
Brad King d0b00a848f Merge topic 'FindTCL-thread-suffix' 
c9f66540 FindTCL: Find 8.6 libraries with 't' suffix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1663
 2018-01-18 09:42:11 -05:00
Brad King 1c681f9200 Merge topic 'fix_ninja_cuda' 
2bd232b5 Ninja: Fixes CUDA device link in Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1662
 2018-01-18 09:41:39 -05:00
Brad King bffdc2e2e1 Merge topic 'msvc_cuda_8_explicitly_specify_cuda_language' 
46abfedb CUDA: MSVC will now state files are cuda files when needed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1658
 2018-01-18 09:41:01 -05:00
Kitware Robot 2868019b2f CMake Nightly Date Stamp 2018-01-18 00:01:26 -05:00
Craig Scott b1fd313826 Merge topic 'FindDoxygen-macos-utils' 
2489e5af FindDoxygen: On macOS search in '/Applications/Utilities' too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1661
 2018-01-17 15:08:22 -05:00
Craig Scott 657898ecad Merge topic 'cmSourceGroup-modern-cxx' 
969c1f94 cmSourceGroup: code improvements; use std::string and C++11 loops

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1656
 2018-01-17 15:06:02 -05:00
Sebastian Holtermann 9cfa213aa6 Autogen: Rename cmQtAutogeneratorInitializer to cmQtAutoGenInitializer 2018-01-17 17:23:49 +01:00
Sebastian Holtermann 79908ae4ae Autogen: Add release notes for (CMAKE_)AUTOGEN_PARALLEL 2018-01-17 17:23:49 +01:00