Brad King
581379cadf
Merge topic 'emacs-mode-font-lock'
...
64e6bc5c
cmake-mode.el: Refine variable font-lock
758664b7
cmake-mode.el: Fix function name font-lock
2015-08-17 10:25:00 -04:00
Brad King
f4885a94ed
Merge topic 'FindBoost-1.59'
...
ff5bb2ef
FindBoost: Add support for Boost 1.59
2015-08-17 10:24:57 -04:00
Brad King
9cba05c684
Merge topic 'FindXercesC-updates'
...
db292564
FindXercesC: Add support for 3D_1 variant of the library
021bf871
FindXercesC: Find debug and release libraries separately
2015-08-17 10:24:55 -04:00
Brad King
8ca1c2b2b3
Merge topic 'FindTIFF-updates'
...
724fa682
FindTIFF: Find debug and release libraries separately
2015-08-17 10:24:53 -04:00
Brad King
89b483f2b6
Merge topic 'update-curl'
...
4071a747
curl: Update README-CMake.txt for new snapshot
7727d485
curl: Update configuration of build within CMake
3f2f1a94
curl: Fix check for gethostbyname_r with 5 arguments
91e8d35a
Merge branch 'curl-upstream' into update-curl
602cdc06
cmCurl: Tolerate lack of CURLOPT_CAPATH support
70654261
curl 7.44.0 (reduced)
2015-08-17 10:24:49 -04:00
Brad King
da3b62cffd
Merge topic 'compiler-id-ancient-gcc-version'
...
6699834d
GNU-DetermineCompiler: Add support for very old versions of GCC
2015-08-17 10:24:47 -04:00
Brad King
a0dab7b774
Merge topic 'FindOpenSSL-imported-targets'
...
75e3a8e8
FindOpenSSL: Provide imported targets OpenSSL::{SSL,Crypto}
79a36437
FindOpenSSL: Revise and format module documentation
2015-08-17 10:24:45 -04:00
Brad King
cb99eff642
Merge topic 'use-generator-target'
...
9b449e9c
cmComputeLinkInformation: Lookup a target only if we have one
2015-08-17 10:24:42 -04:00
Brad King
4071a74707
curl: Update README-CMake.txt for new snapshot
2015-08-17 10:17:51 -04:00
Brad King
7727d485d3
curl: Update configuration of build within CMake
...
Update our curl build option settings as needed for CMake to account for
differences in curl options from 7.38 to 7.44.
2015-08-17 10:17:51 -04:00
Brad King
3f2f1a949c
curl: Fix check for gethostbyname_r with 5 arguments
...
Fix the check code to pass 5 arguments instead of 6. This typo was
introduced in curl 7.39 but was not noticed because the result of
this check is used only if ENABLE_IPV6 is OFF.
2015-08-17 10:17:50 -04:00
Kitware Robot
0f27bcc9ec
CMake Nightly Date Stamp
2015-08-17 00:01:05 -04:00
Kitware Robot
5c8e1ca283
CMake Nightly Date Stamp
2015-08-16 00:01:05 -04:00
Clinton Stimpson
e06ea8373f
cmSystemTools: Use extended length paths for Windows apis.
2015-08-14 23:14:06 -06:00
Clinton Stimpson
ba1065ab7b
cmake: Add support for "--build ." in subdirectory ( #15696 )
2015-08-14 22:46:53 -06:00
Kitware Robot
1628a8af77
CMake Nightly Date Stamp
2015-08-15 00:01:09 -04:00
Chuck Atkins
7f0b83e018
try_compile: Update documentation for other propagated variables
2015-08-14 11:48:54 -04:00
Chuck Atkins
fb77c2c54b
try_compile: Propogate the CMAKE_LINK_SEARCH_ variables
2015-08-14 11:48:01 -04:00
Roy Crihfield
64e6bc5ca3
cmake-mode.el: Refine variable font-lock
...
Simplify regexp for variable names, and allow more legal characters.
Remove `$ *` as legal chars, and allow `- + / .` in names.
2015-08-14 10:16:22 -04:00
Roger Leigh
ff5bb2efbe
FindBoost: Add support for Boost 1.59
2015-08-14 09:55:07 -04:00
Roger Leigh
db29256429
FindXercesC: Add support for 3D_1 variant of the library
...
This version is generated by the Windows Visual Studio
project files for unknown reasons, but is required to
pick up the debug version of the library created by
current versions of Xerces-C.
2015-08-14 09:52:48 -04:00
Roger Leigh
021bf871a6
FindXercesC: Find debug and release libraries separately
2015-08-14 09:52:36 -04:00
Roger Leigh
724fa68270
FindTIFF: Find debug and release libraries separately
2015-08-14 09:49:46 -04:00
Kitware Robot
17ecfd8210
CMake Nightly Date Stamp
2015-08-14 00:01:08 -04:00
Roy Crihfield
758664b7ad
cmake-mode.el: Fix function name font-lock
...
Allow space separating name and opening parenthesis.
2015-08-13 15:24:18 -04:00
Brad King
72250e68db
Merge branch 'release'
2015-08-13 14:40:52 -04:00
Kars de Jong
6699834d62
GNU-DetermineCompiler: Add support for very old versions of GCC
...
Very old versions of gcc (2.3.1) do not define __GNUC_MINOR__.
Signed-off-by: Kars de Jong <kars.dejong@locamation.nl>
2015-08-13 11:07:03 -04:00
Konstantin Podsvirov
75e3a8e811
FindOpenSSL: Provide imported targets OpenSSL::{SSL,Crypto}
2015-08-13 10:58:40 -04:00
Brad King
79a364376c
FindOpenSSL: Revise and format module documentation
...
Improve reStructuredText formatting and add section headers.
2015-08-13 10:53:08 -04:00
Brad King
fb3035a92c
Merge topic 'add-link-search-static-properties-defaults'
...
970a741f
Help: Add notes for topic 'add-link-search-static-properties-defaults'
2015-08-13 10:43:14 -04:00
Brad King
970a741f7d
Help: Add notes for topic 'add-link-search-static-properties-defaults'
2015-08-13 10:42:38 -04:00
Brad King
a07d16085b
Merge topic 'OUTPUT_DIRECTORY-genex'
...
d25819bc
Add generator expression support to OUTPUT_DIRECTORY target properties
e36a05fd
cmTarget: Detect and diagnose recursion in GetOutputInfo
2015-08-13 10:38:54 -04:00
Brad King
0576aa6085
Merge topic 'FindPkgConfig-capital-messages'
...
50c9f521
FindPkgConfig: Capitalize first letter of all message()s
2015-08-13 10:38:46 -04:00
Brad King
d427b5ec71
Merge topic 'add-link-search-static-properties-defaults'
...
675ef165
Allow LINK_SEARCH_{START,END}_STATIC props to have default values.
2015-08-13 10:35:13 -04:00
Chuck Atkins
675ef165f2
Allow LINK_SEARCH_{START,END}_STATIC props to have default values.
...
Use the CMAKE_LINK_SEARCH_START_STATIC and CMAKE_LINK_SEARCH_END_STATIC
variables to initialize the LINK_SEARCH_START_STATIC and
LINK_SEARCH_END_STATIC target properties respectively.
2015-08-13 10:34:44 -04:00
Brad King
7a7922e020
Merge topic 'fix-hpux-link-search-shared-flags'
...
dc64d825
HP-UX: Fix linker search type flags for C shared libs on HP-UX
2015-08-13 10:34:18 -04:00
Brad King
9b449e9c5d
cmComputeLinkInformation: Lookup a target only if we have one
...
The change in commit 27252b24
(cmComputeLinkInformation: Simplify
generator object access, 2015-08-02) broke the conditional use of a
target introduced in commit 41abdc17
(cmGeneratorTarget: Move GetSOName
from cmTarget, 2015-08-04). Restore the conditional lookup. Add a test
case that hacks platform information variables to trigger this code
everywhere.
2015-08-13 10:24:10 -04:00
Brad King
37ab2f38ae
Merge branch 'release'
2015-08-13 09:17:35 -04:00
Brad King
4a6fe02908
CMake 3.3.1
2015-08-13 09:17:06 -04:00
Kitware Robot
a0b32a348d
CMake Nightly Date Stamp
2015-08-13 00:01:07 -04:00
Brad King
91e8d35ab8
Merge branch 'curl-upstream' into update-curl
...
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides. Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
2015-08-12 15:43:52 -04:00
Brad King
602cdc06a0
cmCurl: Tolerate lack of CURLOPT_CAPATH support
...
Since curl 7.39 the CURLOPT_CAPATH setting may be rejected with a
CURLE_NOT_BUILT_IN error. Simply tolerate this with silent failure
since we just will not use the CAPATH setting in this case.
2015-08-12 15:43:24 -04:00
Curl Upstream
7065426158
curl 7.44.0 (reduced)
...
Extract upstream curl using the following shell code.
url=git://github.com/bagder/curl.git &&
v=7.44.0 &&
r=1a7f66a3 &&
paths="
CMake/*
CMakeLists.txt
COPYING
include/curl/*.h
include/curl/curlbuild.h.cmake
lib/*.c
lib/*.h
lib/CMakeLists.txt
lib/Makefile.inc
lib/curl_config.h.cmake
lib/libcurl.rc
lib/vtls/*.c
lib/vtls/*.h
" &&
mkdir curl-$v-g$r-reduced &&
git clone $url curl-git &&
date=$(cd curl-git && git log -n 1 --format='%cd' $r) &&
(cd curl-git && git checkout $r &&
git archive --format=tar $r -- $paths) |
(cd curl-$v-g$r-reduced && tar xv &&
rm lib/config-*.h) &&
echo "g$r date: $date"
2015-08-12 14:18:06 -04:00
Robert Goulet
d25819bc26
Add generator expression support to OUTPUT_DIRECTORY target properties
...
If {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY is set with a genex then
do not add the per-config subdirectory on multi-config generators.
This will allow projects to use $<CONFIG> to place the per-config
part of the directory path somewhere other than the end.
2015-08-12 13:43:00 -04:00
Robert Goulet
e36a05fd7f
cmTarget: Detect and diagnose recursion in GetOutputInfo
2015-08-12 13:42:57 -04:00
Chuck Atkins
dc64d8250b
HP-UX: Fix linker search type flags for C shared libs on HP-UX
...
Since commit v2.8.7~31^2 (HP: Drive shared library linking with compiler
front end, 2011-12-12) the C compiler is used to link shared libraries
instead of calling the linker directly, so linker options need to be
wrapped as -Wl,-foo instead of -foo.
2015-08-12 09:36:57 -04:00
Brad King
ce254de60e
Merge topic 'tests-use-CMAKE_MAKE_PROGRAM'
...
c180f0cb
Tests: Fix CMAKE_MAKE_PROGRAM selection in FortranC.Flags test
586b2e5e
Tests: Fix CMAKE_MAKE_PROGRAM selection in CMakeOnly tests
2015-08-12 09:30:36 -04:00
Brad King
e6883772ff
Merge topic 'FindProtobuf-vs-x64'
...
8dc6cbcb
FindProtobuf: Search x64 directories in VS-built protobuf source (#14833 )
2015-08-12 09:30:34 -04:00
Brad King
1cb7237b51
Merge topic 'ExternalProject-hg-clone-without-update'
...
6a77a77a
ExternalProject: Tell "hg clone" not to implicitly update
2015-08-12 09:30:31 -04:00
Brad King
6731eab90c
Merge topic 'ctest-report-compiler-version'
...
48c6e7f2
CTest: Report to CDash the compiler version used to build the project
2015-08-12 09:30:29 -04:00