kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,674 Commits 1 Branch 14 Tags
Commit Graph

30674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
5ffdd37b7f Merge topic 'boost-1.60' 
0a31fdab FindBoost: Add support for Boost 1.60
 2015-12-18 10:12:44 -05:00
Brad King
81e5bf2548 Merge topic 'update-kwsys' 
38c31ed5 Merge branch 'upstream-KWSys' into update-kwsys
ec1398d7 KWSys 2015-12-14 (c1149ef6)
c4282347 Add script to update KWSys from upstream
f1ee10c1 Merge branch 'upstream-KWSys' into update-kwsys
498c3685 Add a script to help update third-party sources
dcca7892 KWSys 2015-12-09 (cdcf4c47)
 2015-12-18 10:12:41 -05:00
Brad King
83a1f0a99b Merge topic 'BundleUtilities-fix-osx-rpath' 
a479d7a0 BundleUtilities: Fix handling of multiple RPATHs from OS X otool
 2015-12-18 10:12:38 -05:00
Brad King
4395190cd4 Merge topic 'CMakeParseArguments-native-impl' 
ab8a2808 cmake_parse_arguments: consider duplicate keyword as warning
e8b14831 CMakeParseArguments: replace by native cmake_parse_arguments command
cbbdfc2b CMakeParseArguments: add a RunCMake test suite
 2015-12-18 10:12:35 -05:00
Brad King
a5dd0c9d42 Add option to use a system-installed KWIML 
Do not activate it with the general use-system-libs options for now
because KWIML is not commonly distributed or available.
 2015-12-18 10:02:28 -05:00
Brad King
036b6ef7c4 Port CMake from cmIML to KWIML 
KWIML no longer uses a configured prefix.
 2015-12-18 10:02:07 -05:00
Kitware Robot
614c8a1c92 CMake Nightly Date Stamp 2015-12-18 00:01:07 -05:00
Roger Leigh
0a31fdabec FindBoost: Add support for Boost 1.60 2015-12-17 21:46:58 +00:00
Brad King
12293371ee Merge branch 'upstream-KWIML' into import-kwiml 
* upstream-KWIML:
  KWIML 2015-12-09 (43f9f8d0)
 2015-12-17 14:56:40 -05:00
KWIML Upstream
3fdbb0a806 KWIML 2015-12-09 (43f9f8d0) 
Code extracted from:

    https://github.com/Kitware/KWIML.git

at commit 43f9f8d0b0c8ee62aa056a2020981a6d98a40dd4 (master).
 2015-12-17 14:56:38 -05:00
Brad King
55b21d072e Add script to update KWIML from upstream 2015-12-17 14:56:31 -05:00
Brad King
c7d9a24911 Utilities/KWIML: Drop sources to make room for fresh import 2015-12-17 14:55:38 -05:00
Brad King
38c31ed5f5 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2015-12-14 (c1149ef6)
 2015-12-17 14:46:12 -05:00
KWSys Upstream
ec1398d7ae KWSys 2015-12-14 (c1149ef6) 
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit c1149ef69956eab13221e05ffb2d9b5e55c2e3ee (master).

Upstream Shortlog
-----------------

Brad King (1):
      c1149ef6 Drop the FundamentalType.h component of KWSys
 2015-12-17 14:46:11 -05:00
Brad King
c4282347e2 Add script to update KWSys from upstream 2015-12-17 14:46:09 -05:00
Brad King
f1ee10c15e Merge branch 'upstream-KWSys' into update-kwsys 2015-12-17 14:45:57 -05:00
Ben Boeckel
498c36850b Add a script to help update third-party sources 
Use the VTK `ThirdParty/update-common.sh` script as of commit
2f24b7b0f60b67a2a28b9aef210f06f904e7a977.

Co-Author: Brad King <brad.king@kitware.com>
 2015-12-17 14:44:53 -05:00
Emilie Harquel
a479d7a0ae BundleUtilities: Fix handling of multiple RPATHs from OS X otool 
The `otool` command may return multiple RPATH entires, so call
`gp_append_unique` for each one.  Otherwise we may try to ask
`install_name_tool` to deal with the same entry twice.
 2015-12-17 10:56:27 -05:00
Matthias Maennich
ab8a280857 cmake_parse_arguments: consider duplicate keyword as warning 
The behaviour of double specified keywords is rather undefined or at
least not clearly documented. This change introduces a strict check and
emits a warning in case a keyword has been specified more than once.
 2015-12-17 10:45:19 -05:00
Matthias Maennich
e8b148318f CMakeParseArguments: replace by native cmake_parse_arguments command 
Implement a native `cmake_parse_arguments` command that is fully
compatible with the documented behaviour of the previous implementation.
Leave the CMakeParseArguments module empty but existing for
compatibility.
 2015-12-17 10:44:28 -05:00
Matthias Maennich
cbbdfc2b61 CMakeParseArguments: add a RunCMake test suite 2015-12-17 10:31:04 -05:00
Nils Gladitz
24cdb9df59 CMake: Mimic NSIS options dialog in WiX installer 2015-12-17 15:57:30 +01:00
Brad King
2913876c58 Merge topic 'FindOpenGL-no-osx-AGL' 
08580be2 FindOpenGL: Don't add AGL to OPENGL_LIBRARIES on OS X.
 2015-12-17 09:55:11 -05:00
Kitware Robot
e51fa1dc4d CMake Nightly Date Stamp 2015-12-17 00:01:05 -05:00
Kitware Robot
7e29021465 CMake Nightly Date Stamp 2015-12-16 00:01:06 -05:00
Kitware Robot
7a47745d69 CMake Nightly Date Stamp 2015-12-15 00:01:08 -05:00
Nils Gladitz
de77d4a741 CPackWIX: Allow multiple patch files and diagnose if any are missing 
CPACK_WIX_PATCH_FILE now accepts a list of patch files.
An error will now be produced if any of the patch files is missing.

Previously this would be silently ignored.
 2015-12-14 23:28:42 +01:00
KWSys Upstream
dcca789272 KWSys 2015-12-09 (cdcf4c47) 
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit cdcf4c4753d8e90895f1fb2cb6ab622342bcaaa8.
 2015-12-14 14:37:35 -05:00
Brad King
6a6d00aeef Merge branch 'release' 2015-12-14 10:02:23 -05:00
Brad King
22ccae1d68 Merge topic 'FindProtobuf-fix-case' 
2908103d FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND
 2015-12-14 10:00:05 -05:00
Brad King
c952f2b424 Merge topic 'FindGTest-imported-targets' 
f0b5ce7f Help: Add notes for topic 'FindGTest-imported-targets'
99afe235 Tests: Add tests for FindGTest
611735e7 FindGTest: Add imported targets and update documentation
 2015-12-14 10:00:02 -05:00
Brad King
09da79b40f Merge topic 'fix-CMP0065-NEW-AIX-HP' 
f254276f AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW
 2015-12-14 09:59:58 -05:00
Brad King
f0b5ce7f94 Help: Add notes for topic 'FindGTest-imported-targets' 2015-12-14 09:56:30 -05:00
David Gobbi
08580be2ad FindOpenGL: Don't add AGL to OPENGL_LIBRARIES on OS X. 
CMake had been setting OPENGL_glu_LIBRARY to AGL.framework, even
though AGL is not GLU.  AGL is simply the GL component for the
deprecated Carbon framework.  GLU is provided by OpenGL.framework.

A side effect of the old behavior was that if AGL was not found
(it is absent from OS X SDK 10.10 or later), then OPENGL_GLU_FOUND
would be incorrectly set to "NO".
 2015-12-14 09:46:32 -05:00
Kitware Robot
b97018534f CMake Nightly Date Stamp 2015-12-14 00:01:05 -05:00
Kitware Robot
ac6025c5ff CMake Nightly Date Stamp 2015-12-13 00:01:06 -05:00
Nils Gladitz
38d723b37e CPackWIX: Allow patching of shortcut components 2015-12-12 10:36:51 +01:00
Kitware Robot
8ed8c29564 CMake Nightly Date Stamp 2015-12-12 00:01:07 -05:00
Sebastian Schuberth
2908103d04 FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND 
All other modules use their module name (e.g. XxX for FindXxX.cmake) in
find_package_handle_standard_args. Protobuf used all-caps, which triggers
a bug when we try to find Protobuf with the CMakeFindDependencyMacro.cmake
macro, which only checks for the mixed-case _FOUND.
 2015-12-11 10:03:22 -05:00
Brad King
a680211ca7 Merge topic 'ios-universal' 
565d080a Xcode: Add support for combined install on iOS
34f5ef56 iOS: Fix App Bundle layout
 2015-12-11 09:47:18 -05:00
Brad King
53930877b3 Merge topic 'simplify-CTest.UpdateGIT-test' 
972849fb Tests: Simplify CTest.UpdateGIT repo path construction
 2015-12-11 09:43:58 -05:00
Brad King
57d5628fd9 Merge topic 'release-wix-config' 
4c60e07d CMake: Fix WiX-generated .msi package file name convention
a42bf6c5 Utilities/Release: Add support for copying .msi files
93936d78 Utilities/Release: Avoid repeat copy of files with same suffix
 2015-12-11 09:43:54 -05:00
Brad King
198e7df97e Merge topic 'FindOpenMP-clang' 
1549927d FindOpenMP: Add Clang support
 2015-12-11 09:43:51 -05:00
Brad King
c634b5d4c5 Merge topic 'wix-fix-comp-install-prop' 
ecdc77f1 CPackWIX: Fix installed file property lookups when using components
 2015-12-11 09:43:48 -05:00
Brad King
63f2737993 Merge topic 'update-kwsys' 
c025e61a Merge branch 'upstream-kwsys' into update-kwsys
2b7a47d7 KWSys 2015-12-09 (cdcf4c47)
 2015-12-11 09:43:45 -05:00
Brad King
05d8aed844 Merge topic 'cmake-W-options' 
29127534 cmake: Deduplicate warning message control code
67211011 cmake-gui: Add options to control warning messages
 2015-12-11 09:43:42 -05:00
Brad King
e240a489c1 Merge topic 'graphviz-spaces' 
e0ad72d8 Graphviz: Fix handling of spaces in GRAPHVIZ_GRAPH_NAME
 2015-12-11 09:43:39 -05:00
Brad King
67afa4e407 Merge topic 'FindOpenAL-win-arch' 
39abbaed FindOpenAL: Detect Windows architecture-specific installation
 2015-12-11 09:43:37 -05:00
Brad King
511e5dbd71 Merge topic 'cmake-E-multiple-inputs' 
7984ac5e cmake: Teach -E make_directory to support multiple input directories
4ce6fbc7 Help: Rename release notes for topic 'cmake-E-multiple-inputs'
 2015-12-11 09:43:34 -05:00
Brad King
a9e8b123de Merge branch 'fix-CMP0065-NEW-AIX-HP' into release 2015-12-11 09:36:30 -05:00