This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 283c93fe9abe481836a41eb3e565a02d215965c5 (commit)
via 9e8f2e509f61c4478f2176a03e45c1fd35537d82 (commit)
via 60666e2cd38d4c2922cc4fdc2e062fec975bc5f3 (commit)
via c84fe1e71fb9bd9bbb4a5d5184b58ecffe8192e3 (commit)
via 9143627c93aaa3fadd54aabaf662918e8f882c6a (commit)
via 74720a298cec05af29f18315990f64ddfda344f6 (commit)
via 9922e70b1ac308a74bbd3aeceb4cc0406b12f55b (commit)
via 5000fed5af6925a7d57083c8806ea0537e97bdda (commit)
via 20b7826e1477c4463c9fc7f710f02d5f58a0749f (commit)
via 261ae28ccde2059905b7febeb5126515c2da39ef (commit)
from 003759ba0da49dfa35bccfc1c4432e4ec935cd86 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=283c93fe9abe481836a41eb3e565a02d215965c5
commit 283c93fe9abe481836a41eb3e565a02d215965c5
Merge: 9e8f2e5 74720a2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 11 12:52:36 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jan 11 07:52:53 2019 -0500
Merge topic 'xl-early-bE'
74720a298c XL: Move '-bE' flag earlier so it can be overridden
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2771
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e8f2e509f61c4478f2176a03e45c1fd35537d82
commit 9e8f2e509f61c4478f2176a03e45c1fd35537d82
Merge: 60666e2 5000fed
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 11 12:51:57 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jan 11 07:52:05 2019 -0500
Merge topic 'bison_target_policy'
5000fed5af FindBISON: Add policy CMP0088 to run bison in build tree
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2774
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60666e2cd38d4c2922cc4fdc2e062fec975bc5f3
commit 60666e2cd38d4c2922cc4fdc2e062fec975bc5f3
Merge: c84fe1e 261ae28
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 11 12:43:08 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jan 11 07:46:16 2019 -0500
Merge topic 'fix-doc-typo'
261ae28ccd Help: fix typo for CTEST_CUSTOM_TESTS_IGNORE
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2770
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c84fe1e71fb9bd9bbb4a5d5184b58ecffe8192e3
commit c84fe1e71fb9bd9bbb4a5d5184b58ecffe8192e3
Merge: 9143627 20b7826
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 11 12:42:54 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jan 11 07:45:07 2019 -0500
Merge topic 'sort1'
20b7826e14 Help: correct alphabetical sorting of lines
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2784
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9143627c93aaa3fadd54aabaf662918e8f882c6a
commit 9143627c93aaa3fadd54aabaf662918e8f882c6a
Merge: 003759b 9922e70
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 11 12:43:02 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jan 11 07:43:57 2019 -0500
Merge topic 'doc-roff-fix'
9922e70b1a Help: Prevent .so from being treated as a roff macro
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2756
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74720a298cec05af29f18315990f64ddfda344f6
commit 74720a298cec05af29f18315990f64ddfda344f6
Author: Rob Boehne <r...@datalogics.com>
AuthorDate: Thu Jan 3 16:42:23 2019 -0600
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 10 14:25:06 2019 -0500
XL: Move '-bE' flag earlier so it can be overridden
By default, we generate an export list for a shared library and pass
that file on the link line. The problem was that it could not be
overridden by a target when a specific export file is being used.
Multiple `-bE` flags on the link are overridden by subsequent `-bE`
flags, so only the last one is used.
Fixes: #13282
diff --git a/Modules/Compiler/XL.cmake b/Modules/Compiler/XL.cmake
index 21fe5e8..68dc28a 100644
--- a/Modules/Compiler/XL.cmake
+++ b/Modules/Compiler/XL.cmake
@@ -48,7 +48,7 @@ macro(__compiler_xl lang)
# files so that we export only the symbols actually provided by the
sources.
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
"${CMAKE_XL_CreateExportList} <OBJECT_DIR>/objects.exp <OBJECTS>"
- "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS>
<LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -Wl,-bE:<OBJECT_DIR>/objects.exp
<SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
+ "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS>
-Wl,-bE:<OBJECT_DIR>/objects.exp <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o
<TARGET> <OBJECTS> <LINK_LIBRARIES>"
)
endif()
endmacro()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9922e70b1ac308a74bbd3aeceb4cc0406b12f55b
commit 9922e70b1ac308a74bbd3aeceb4cc0406b12f55b
Author: Raf Czlonka <rczlo...@gmail.com>
AuthorDate: Thu Dec 20 09:50:20 2018 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 10 13:38:51 2019 -0500
Help: Prevent .so from being treated as a roff macro
Move `.so` to the line above - otherwise it is being treated as a `roff`
macro, i.e.:
$ mandoc -Tlint /usr/local/man/man7/cmake-properties.7 | head -n 3
mandoc: /usr/local/man/man7/cmake-properties.7:1131:2: WARNING: .so is
fragile, better use ln(1): so libraries.
mandoc: /usr/local/man/man7/cmake-properties.7: ERROR: No such file or
directory
mandoc: /usr/local/man/man7/cmake-properties.7:1131:15: ERROR: .so
request failed: .so libraries.
and causes other issues down the line.
diff --git a/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
b/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
index bc67380..d0cd29d 100644
--- a/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
+++ b/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
@@ -1,8 +1,8 @@
ANDROID_NATIVE_LIB_DIRECTORIES
------------------------------
-Set the Android property that specifies directories to search for the
-.so libraries.
+Set the Android property that specifies directories to search for the ``.so``
+libraries.
This a string property that contains the directory paths separated
by semicolons.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5000fed5af6925a7d57083c8806ea0537e97bdda
commit 5000fed5af6925a7d57083c8806ea0537e97bdda
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Jan 8 10:50:10 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 10 13:23:14 2019 -0500
FindBISON: Add policy CMP0088 to run bison in build tree
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 40ec1ef..409b5b1 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -57,6 +57,7 @@ Policies Introduced by CMake 3.14
.. toctree::
:maxdepth: 1
+ CMP0088: FindBISON runs bison in CMAKE_CURRENT_BINARY_DIR when executing.
</policy/CMP0088>
CMP0087: install(SCRIPT | CODE) supports generator expressions.
</policy/CMP0087>
CMP0086: UseSWIG honors SWIG_MODULE_NAME via -module flag. </policy/CMP0086>
CMP0085: IN_LIST generator expression handles empty list items.
</policy/CMP0085>
diff --git a/Help/policy/CMP0088.rst b/Help/policy/CMP0088.rst
new file mode 100644
index 0000000..82c04ef
--- /dev/null
+++ b/Help/policy/CMP0088.rst
@@ -0,0 +1,29 @@
+CMP0088
+-------
+
+:module:`FindBISON` runs bison in :variable:`CMAKE_CURRENT_BINARY_DIR`
+when executing.
+
+The module provides a ``BISON_TARGET`` macro which generates BISON output.
+In CMake 3.13 and below the macro would generate a custom command that runs
+``bison`` in the source directory. CMake 3.14 and later prefer to run it
+in the build directory and use :variable:`CMAKE_CURRENT_BINARY_DIR` as the
+``WORKING_DIRECTORY`` of its :command:`add_custom_command` invocation.
+This ensures that any implicitly generated file is written to the build
+tree rather than the source.
+
+This policy provides compatibility for projects that have not been updated
+to expect the new behavior.
+
+The ``OLD`` behavior for this policy is for ``BISON_TARGET`` to use
+the current source directory for the ``WORKING_DIRECTORY`` and where
+to generate implicit files. The ``NEW`` behavior of this policy is to
+use the current binary directory for the ``WORKING_DIRECTORY`` and where
+to generate implicit files.
+
+This policy was introduced in CMake version 3.14. Use the
+:command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly.
+Unlike most policies, CMake version |release| does *not* warn
+when this policy is not set and simply uses ``OLD`` behavior.
+
+.. include:: DEPRECATED.txt
diff --git a/Help/release/dev/bison_target_policy.rst
b/Help/release/dev/bison_target_policy.rst
new file mode 100644
index 0000000..3240318
--- /dev/null
+++ b/Help/release/dev/bison_target_policy.rst
@@ -0,0 +1,6 @@
+bison_target_policy
+-------------------
+
+* The :module:`FindBISON` module's ``BISON_TARGET`` command now runs ``bison``
+ with :variable:`CMAKE_CURRENT_BINARY_DIR` as the working directory.
+ See policy :policy:`CMP0088`.
diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index d59dc27..06ac2d9 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -151,7 +151,15 @@ if(BISON_EXECUTABLE)
list(APPEND BISON_TARGET_cmdopt
"--report-file=${BISON_TARGET_verbose_file}")
endif()
if(NOT IS_ABSOLUTE "${BISON_TARGET_verbose_file}")
- set(BISON_TARGET_verbose_file
"${CMAKE_CURRENT_SOURCE_DIR}/${BISON_TARGET_verbose_file}")
+ cmake_policy(GET CMP0088 _BISON_CMP0088
+ PARENT_SCOPE # undocumented, do not use outside of CMake
+ )
+ if("x${_BISON_CMP0088}x" STREQUAL "xNEWx")
+ set(BISON_TARGET_verbose_file
"${CMAKE_CURRENT_BINARY_DIR}/${BISON_TARGET_verbose_file}")
+ else()
+ set(BISON_TARGET_verbose_file
"${CMAKE_CURRENT_SOURCE_DIR}/${BISON_TARGET_verbose_file}")
+ endif()
+ unset(_BISON_CMP0088)
endif()
endmacro()
@@ -159,6 +167,15 @@ if(BISON_EXECUTABLE)
# adds a custom command and sets
# BISON_TARGET_cmdopt, BISON_TARGET_extraoutputs
macro(BISON_TARGET_option_verbose Name BisonOutput filename)
+ cmake_policy(GET CMP0088 _BISON_CMP0088
+ PARENT_SCOPE # undocumented, do not use outside of CMake
+ )
+ set(_BISON_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ if("x${_BISON_CMP0088}x" STREQUAL "xNEWx")
+ set(_BISON_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ endif()
+ unset(_BISON_CMP0088)
+
list(APPEND BISON_TARGET_cmdopt "--verbose")
list(APPEND BISON_TARGET_outputs
"${BISON_TARGET_verbose_file}")
@@ -166,8 +183,9 @@ if(BISON_EXECUTABLE)
if(IS_ABSOLUTE "${filename}")
set(BISON_TARGET_verbose_extra_file "${filename}")
else()
- set(BISON_TARGET_verbose_extra_file
"${CMAKE_CURRENT_SOURCE_DIR}/${filename}")
+ set(BISON_TARGET_verbose_extra_file
"${_BISON_WORKING_DIRECTORY}/${filename}")
endif()
+
add_custom_command(OUTPUT ${BISON_TARGET_verbose_extra_file}
COMMAND ${CMAKE_COMMAND} -E copy
"${BISON_TARGET_verbose_file}"
@@ -176,10 +194,11 @@ if(BISON_EXECUTABLE)
DEPENDS
"${BISON_TARGET_verbose_file}"
COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ WORKING_DIRECTORY ${_BISON_WORKING_DIRECTORY})
list(APPEND BISON_TARGET_extraoutputs
"${BISON_TARGET_verbose_extra_file}")
unset(BISON_TARGET_verbose_extra_file)
+ unset(_BISON_WORKING_DIRECTORY)
endif()
endmacro()
@@ -234,12 +253,23 @@ if(BISON_EXECUTABLE)
list(APPEND BISON_TARGET_outputs "${BISON_TARGET_output_header}")
+ cmake_policy(GET CMP0088 _BISON_CMP0088
+ PARENT_SCOPE # undocumented, do not use outside of CMake
+ )
+ set(_BISON_WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ if("x${_BISON_CMP0088}x" STREQUAL "xNEWx")
+ set(_BISON_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ endif()
+ unset(_BISON_CMP0088)
+
add_custom_command(OUTPUT ${BISON_TARGET_outputs}
COMMAND ${BISON_EXECUTABLE} ${BISON_TARGET_cmdopt} -o ${BisonOutput}
${BisonInput}
VERBATIM
DEPENDS ${BisonInput}
COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ WORKING_DIRECTORY ${_BISON_WORKING_DIRECTORY})
+
+ unset(_BISON_WORKING_DIRECTORY)
# define target variables
set(BISON_${Name}_DEFINED TRUE)
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 206dd3d..314f27d 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -258,6 +258,9 @@ class cmMakefile;
SELECT(POLICY, CMP0087, \
"Install CODE|SCRIPT allow the use of generator " \
"expressions.", \
+ 3, 14, 0, cmPolicies::WARN) \
+ SELECT(POLICY, CMP0088, \
+ "FindBISON runs bison in CMAKE_CURRENT_BINARY_DIR when executing.", \
3, 14, 0, cmPolicies::WARN)
#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20b7826e1477c4463c9fc7f710f02d5f58a0749f
commit 20b7826e1477c4463c9fc7f710f02d5f58a0749f
Author: Joachim Wuttke (o) <j.wut...@fz-juelich.de>
AuthorDate: Thu Jan 10 12:57:49 2019 +0100
Commit: Joachim Wuttke (o) <j.wut...@fz-juelich.de>
CommitDate: Thu Jan 10 12:58:59 2019 +0100
Help: correct alphabetical sorting of lines
diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst
index aec9ba5..ee13e40 100644
--- a/Help/manual/cmake-commands.7.rst
+++ b/Help/manual/cmake-commands.7.rst
@@ -22,8 +22,8 @@ These commands are always available.
/command/cmake_policy
/command/configure_file
/command/continue
- /command/elseif
/command/else
+ /command/elseif
/command/endforeach
/command/endfunction
/command/endif
@@ -53,9 +53,9 @@ These commands are always available.
/command/option
/command/return
/command/separate_arguments
+ /command/set
/command/set_directory_properties
/command/set_property
- /command/set
/command/site_name
/command/string
/command/unset
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=261ae28ccde2059905b7febeb5126515c2da39ef
commit 261ae28ccde2059905b7febeb5126515c2da39ef
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Jan 2 15:39:43 2019 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Jan 2 15:42:33 2019 -0500
Help: fix typo for CTEST_CUSTOM_TESTS_IGNORE
In commit v3.4.0-rc1~57^2 (Help: document CTEST_CUSTOM_* variables,
2015-09-17), the CTEST_CUSTOM_TESTS_IGNORE variable was documented with
a typo.
diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim
index b67ef06..1083036 100644
--- a/Auxiliary/vim/syntax/cmake.vim
+++ b/Auxiliary/vim/syntax/cmake.vim
@@ -733,7 +733,7 @@ syn keyword cmakeVariable contained
\ CTEST_CUSTOM_POST_TEST
\ CTEST_CUSTOM_PRE_MEMCHECK
\ CTEST_CUSTOM_PRE_TEST
- \ CTEST_CUSTOM_TEST_IGNORE
+ \ CTEST_CUSTOM_TESTS_IGNORE
\ CTEST_CUSTOM_WARNING_EXCEPTION
\ CTEST_CUSTOM_WARNING_MATCH
\ CTEST_CVS_CHECKOUT
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index d808b1c..e464b0c 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -541,7 +541,7 @@ Variables for CTest
/variable/CTEST_CUSTOM_POST_TEST
/variable/CTEST_CUSTOM_PRE_MEMCHECK
/variable/CTEST_CUSTOM_PRE_TEST
- /variable/CTEST_CUSTOM_TEST_IGNORE
+ /variable/CTEST_CUSTOM_TESTS_IGNORE
/variable/CTEST_CUSTOM_WARNING_EXCEPTION
/variable/CTEST_CUSTOM_WARNING_MATCH
/variable/CTEST_CVS_CHECKOUT
diff --git a/Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst
b/Help/variable/CTEST_CUSTOM_TESTS_IGNORE.rst
similarity index 71%
rename from Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst
rename to Help/variable/CTEST_CUSTOM_TESTS_IGNORE.rst
index 6114e60..57222ca 100644
--- a/Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst
+++ b/Help/variable/CTEST_CUSTOM_TESTS_IGNORE.rst
@@ -1,5 +1,5 @@
-CTEST_CUSTOM_TEST_IGNORE
-------------------------
+CTEST_CUSTOM_TESTS_IGNORE
+-------------------------
A list of regular expressions to use to exclude tests during the
:command:`ctest_test` command.
-----------------------------------------------------------------------
Summary of changes:
Auxiliary/vim/syntax/cmake.vim | 2 +-
Help/manual/cmake-commands.7.rst | 4 +--
Help/manual/cmake-policies.7.rst | 1 +
Help/manual/cmake-variables.7.rst | 2 +-
Help/policy/CMP0088.rst | 29 +++++++++++++++++
Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst | 4 +--
Help/release/dev/bison_target_policy.rst | 6 ++++
...ST_IGNORE.rst => CTEST_CUSTOM_TESTS_IGNORE.rst} | 4 +--
Modules/Compiler/XL.cmake | 2 +-
Modules/FindBISON.cmake | 38 +++++++++++++++++++---
Source/cmPolicies.h | 3 ++
11 files changed, 82 insertions(+), 13 deletions(-)
create mode 100644 Help/policy/CMP0088.rst
create mode 100644 Help/release/dev/bison_target_policy.rst
rename Help/variable/{CTEST_CUSTOM_TEST_IGNORE.rst =>
CTEST_CUSTOM_TESTS_IGNORE.rst} (71%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
