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 9e961930ee1ab526467651935bf7c285c170432d (commit)
via 04f869bb4645aae8171f70746898ca20d3c05be1 (commit)
via 89a628e28f68daf124129aa1810ba50a420a64c2 (commit)
via d4805dd47bc6ea586e16ac5eb9f5bd07f2ff6901 (commit)
via cd5002579d64898e6392934e2acb33b199765846 (commit)
via 458c589fe33fb5e827e9dbcd7799a0cac2559dba (commit)
via 00e39a4afcb65b3c78acc81e6080c204be84f16f (commit)
via 2f72573a62adcb4ef8805163f56bd0a1880fa279 (commit)
via 24e2bc42191b6001b8683d929dd097f68332698f (commit)
via 72d3161a7f5d350d848d5b44cf343bac19e22238 (commit)
via f19c70c3d29f277f82f18820d36ca17e9ba398ae (commit)
from a4ddc7357ae880b3695dccec44e383cfa77c7572 (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=9e961930ee1ab526467651935bf7c285c170432d
commit 9e961930ee1ab526467651935bf7c285c170432d
Merge: 04f869b 458c589
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 29 13:23:01 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 29 08:23:11 2017 -0500
Merge topic 'win-clang-debug'
458c589f FindBoost: Add Windows ABI tag for Clang debug
00e39a4a FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1529
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04f869bb4645aae8171f70746898ca20d3c05be1
commit 04f869bb4645aae8171f70746898ca20d3c05be1
Merge: 89a628e 72d3161
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 29 13:22:10 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 29 08:22:15 2017 -0500
Merge topic 'cppcheck_testdriver'
72d3161a TestDriver: fix style-'variableScope' cppcheck warning
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1518
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89a628e28f68daf124129aa1810ba50a420a64c2
commit 89a628e28f68daf124129aa1810ba50a420a64c2
Merge: d4805dd f19c70c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 29 13:21:39 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 29 08:21:44 2017 -0500
Merge topic 'fortran-compiler-launcher'
f19c70c3 Fortran: Add option to run the compiler through launcher tools
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1517
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4805dd47bc6ea586e16ac5eb9f5bd07f2ff6901
commit d4805dd47bc6ea586e16ac5eb9f5bd07f2ff6901
Merge: cd50025 2f72573
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 29 13:20:43 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 29 08:20:45 2017 -0500
Merge topic 'cuda-implicit-include-dirs'
2f72573a CUDA: Treat /usr/include as an implicit include directory
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1528
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd5002579d64898e6392934e2acb33b199765846
commit cd5002579d64898e6392934e2acb33b199765846
Merge: a4ddc73 24e2bc4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 29 13:19:18 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 29 08:19:28 2017 -0500
Merge topic 'GNUInstallDirs-update-link'
24e2bc42 GNUInstallDirs: Update link to 64-bit ABI documents
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1527
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=458c589fe33fb5e827e9dbcd7799a0cac2559dba
commit 458c589fe33fb5e827e9dbcd7799a0cac2559dba
Author: Roger Leigh <rle...@dundee.ac.uk>
AuthorDate: Mon Nov 27 15:52:45 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 27 13:49:01 2017 -0500
FindBoost: Add Windows ABI tag for Clang debug
Thanks to Walter Pearce for this suggestion.
Fixes: #17505
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index b1805ce..0786248 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1393,6 +1393,7 @@ endif()
# support libraries
if(WIN32 AND Boost_USE_DEBUG_RUNTIME)
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
+ OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang"
OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel")
string(APPEND _boost_DEBUG_ABI_TAG "g")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00e39a4afcb65b3c78acc81e6080c204be84f16f
commit 00e39a4afcb65b3c78acc81e6080c204be84f16f
Author: Roger Leigh <rle...@dundee.ac.uk>
AuthorDate: Mon Nov 27 16:16:34 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 27 13:48:22 2017 -0500
FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6f60eeb..b1805ce 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -429,9 +429,7 @@ endfunction()
# Guesses Boost's compiler prefix used in built library names
# Returns the guess by setting the variable pointed to by _ret
function(_Boost_GUESS_COMPILER_PREFIX _ret)
- if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
- OR CMAKE_CXX_COMPILER MATCHES "icl"
- OR CMAKE_CXX_COMPILER MATCHES "icpc")
+ if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel")
if(WIN32)
set (_boost_COMPILER "-iw")
else()
@@ -1395,8 +1393,7 @@ endif()
# support libraries
if(WIN32 AND Boost_USE_DEBUG_RUNTIME)
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
+ OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel")
string(APPEND _boost_DEBUG_ABI_TAG "g")
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f72573a62adcb4ef8805163f56bd0a1880fa279
commit 2f72573a62adcb4ef8805163f56bd0a1880fa279
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 27 09:07:42 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 27 10:24:13 2017 -0500
CUDA: Treat /usr/include as an implicit include directory
We already do this for C and C++.
Fixes: #17512
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 5687653..328d3c6 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -69,6 +69,9 @@ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
/usr/include
)
+list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
+ /usr/include
+ )
# Enable use of lib32 and lib64 search path variants by default.
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24e2bc42191b6001b8683d929dd097f68332698f
commit 24e2bc42191b6001b8683d929dd097f68332698f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 27 10:00:21 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 27 10:01:35 2017 -0500
GNUInstallDirs: Update link to 64-bit ABI documents
Suggested-by: Chris Coutinho <chrisbcouti...@gmail.com>
Fixes: #17503
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 91361d2..9dd464c 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -205,7 +205,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
# - we are on Linux system but NOT cross-compiling
# - we are NOT on debian
# - we are on a 64 bits system
- # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+ # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
# and CMAKE_INSTALL_PREFIX is "/usr"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d3161a7f5d350d848d5b44cf343bac19e22238
commit 72d3161a7f5d350d848d5b44cf343bac19e22238
Author: Sylvain Joubert <joubert...@gmail.com>
AuthorDate: Wed Nov 22 19:54:00 2017 +0100
Commit: Sylvain Joubert <joubert...@gmail.com>
CommitDate: Wed Nov 22 19:54:00 2017 +0100
TestDriver: fix style-'variableScope' cppcheck warning
When applied on a user project, cppcheck complains that the 'test_name'
variable could have a reduced scope.
diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index bf61be4..ff3c869 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -58,7 +58,7 @@ static char* lowercase(const char* string)
int main(int ac, char* av[])
{
int i, testNum = 0, partial_match;
- char *arg, *test_name;
+ char *arg;
int testToRun = -1;
@CMAKE_TESTDRIVER_ARGVC_FUNCTION@
@@ -99,7 +99,7 @@ int main(int ac, char* av[])
arg = lowercase(av[1 + partial_match]);
}
for (i = 0; i < NumTests && testToRun == -1; ++i) {
- test_name = lowercase(cmakeGeneratedFunctionMapEntries[i].name);
+ char *test_name = lowercase(cmakeGeneratedFunctionMapEntries[i].name);
if (partial_match != 0 && strstr(test_name, arg) != NULL) { /* NOLINT */
testToRun = i;
ac -= 2;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f19c70c3d29f277f82f18820d36ca17e9ba398ae
commit f19c70c3d29f277f82f18820d36ca17e9ba398ae
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 21 14:40:42 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 21 14:44:01 2017 -0500
Fortran: Add option to run the compiler through launcher tools
Add a `Fortran_COMPILER_LAUNCHER` target property like those added for C
and CXX by commit v3.4.0-rc1~450^2 (Add options to launch the compiler
through tools like ccache or distcc, 2015-06-04) and CUDA by commit
v3.10.0-rc1~531^2 (CUDA: Add option to run the compiler through launcher
tools, 2017-06-09).
Fixes: #17499
diff --git a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
index 28925fc..b63d6d7 100644
--- a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
+++ b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
@@ -2,7 +2,7 @@
------------------------
This property is implemented only when ``<LANG>`` is ``C``, ``CXX``,
-or ``CUDA``.
+``Fortran``, or ``CUDA``.
Specify a :ref:`;-list <CMake Language Lists>` containing a command line
for a compiler launching tool. The :ref:`Makefile Generators` and the
diff --git a/Help/release/dev/fortran-compiler-launcher.rst
b/Help/release/dev/fortran-compiler-launcher.rst
new file mode 100644
index 0000000..ce254f1
--- /dev/null
+++ b/Help/release/dev/fortran-compiler-launcher.rst
@@ -0,0 +1,8 @@
+fortran-compiler-launcher
+-------------------------
+
+* The :ref:`Makefile Generators` and the :generator:`Ninja` generator learned
+ to add compiler launcher tools along with the compiler for the ``Fortran``
+ language (``C``, ``CXX``, and ``CUDA`` were supported previously).
+ See the :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
+ :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.
diff --git a/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
b/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
index f4e2ba5..e6c8bb5 100644
--- a/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
+++ b/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
@@ -3,4 +3,5 @@ CMAKE_<LANG>_COMPILER_LAUNCHER
Default value for :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property.
This variable is used to initialize the property on each target as it is
-created. This is done only when ``<LANG>`` is ``C``, ``CXX``, or ``CUDA``.
+created. This is done only when ``<LANG>`` is ``C``, ``CXX``, ``Fortran``,
+or ``CUDA``.
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 7db010c..dd8a373 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -657,8 +657,8 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
}
// Maybe insert a compiler launcher like ccache or distcc
- if (!compileCommands.empty() &&
- (lang == "C" || lang == "CXX" || lang == "CUDA")) {
+ if (!compileCommands.empty() && (lang == "C" || lang == "CXX" ||
+ lang == "Fortran" || lang == "CUDA")) {
std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
const char* clauncher =
this->GeneratorTarget->GetProperty(clauncher_prop);
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 5805259..0262b3c 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -647,7 +647,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
// Maybe insert a compiler launcher like ccache or distcc
if (!compileCmds.empty() &&
- (lang == "C" || lang == "CXX" || lang == "CUDA")) {
+ (lang == "C" || lang == "CXX" || lang == "Fortran" || lang == "CUDA")) {
std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
const char* clauncher = this->GeneratorTarget->GetProperty(clauncher_prop);
if (clauncher && *clauncher) {
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index bf36074..9df8798 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -238,6 +238,7 @@ cmTarget::cmTarget(std::string const& name,
cmStateEnums::TargetType type,
this->SetPropertyDefault("COMPILE_PDB_OUTPUT_DIRECTORY", nullptr);
this->SetPropertyDefault("Fortran_FORMAT", nullptr);
this->SetPropertyDefault("Fortran_MODULE_DIRECTORY", nullptr);
+ this->SetPropertyDefault("Fortran_COMPILER_LAUNCHER", nullptr);
this->SetPropertyDefault("GNUtoMS", nullptr);
this->SetPropertyDefault("OSX_ARCHITECTURES", nullptr);
this->SetPropertyDefault("IOS_INSTALL_COMBINED", nullptr);
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f306200..aa075b0 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -385,6 +385,9 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
if(DEFINED CMake_TEST_CUDA)
list(APPEND CompilerLauncher_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA})
endif()
+ if(CMAKE_Fortran_COMPILER)
+ list(APPEND CompilerLauncher_ARGS -DCMake_TEST_Fortran=1)
+ endif()
add_RunCMake_test(CompilerLauncher)
add_RunCMake_test(ctest_labels_for_subprojects)
endif()
diff --git a/Tests/RunCMake/CompilerLauncher/Fortran-Build-stdout.txt
b/Tests/RunCMake/CompilerLauncher/Fortran-Build-stdout.txt
new file mode 100644
index 0000000..3313e31
--- /dev/null
+++ b/Tests/RunCMake/CompilerLauncher/Fortran-Build-stdout.txt
@@ -0,0 +1 @@
+.*-E env USED_LAUNCHER=1.*
diff --git a/Tests/RunCMake/CompilerLauncher/Fortran-launch-Build-stdout.txt
b/Tests/RunCMake/CompilerLauncher/Fortran-launch-Build-stdout.txt
new file mode 100644
index 0000000..3313e31
--- /dev/null
+++ b/Tests/RunCMake/CompilerLauncher/Fortran-launch-Build-stdout.txt
@@ -0,0 +1 @@
+.*-E env USED_LAUNCHER=1.*
diff --git a/Tests/RunCMake/CompilerLauncher/Fortran-launch.cmake
b/Tests/RunCMake/CompilerLauncher/Fortran-launch.cmake
new file mode 100644
index 0000000..7e9a564
--- /dev/null
+++ b/Tests/RunCMake/CompilerLauncher/Fortran-launch.cmake
@@ -0,0 +1,3 @@
+set(CTEST_USE_LAUNCHERS 1)
+include(CTestUseLaunchers)
+include(Fortran.cmake)
diff --git a/Tests/RunCMake/CompilerLauncher/Fortran.cmake
b/Tests/RunCMake/CompilerLauncher/Fortran.cmake
new file mode 100644
index 0000000..72cc03e
--- /dev/null
+++ b/Tests/RunCMake/CompilerLauncher/Fortran.cmake
@@ -0,0 +1,4 @@
+enable_language(Fortran)
+set(CMAKE_Fortran_COMPILER_LAUNCHER "${CMAKE_COMMAND};-E;env;USED_LAUNCHER=1")
+set(CMAKE_VERBOSE_MAKEFILE TRUE)
+add_executable(main main.F)
diff --git a/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
b/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
index ab26512..bb8da03 100644
--- a/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake
@@ -19,6 +19,9 @@ set(langs C CXX)
if(CMake_TEST_CUDA)
list(APPEND langs CUDA)
endif()
+if(CMake_TEST_Fortran)
+ list(APPEND langs Fortran)
+endif()
foreach(lang ${langs})
run_compiler_launcher(${lang})
diff --git a/Tests/RunCMake/CompilerLauncher/main.F
b/Tests/RunCMake/CompilerLauncher/main.F
new file mode 100644
index 0000000..53ec0d1
--- /dev/null
+++ b/Tests/RunCMake/CompilerLauncher/main.F
@@ -0,0 +1,2 @@
+ PROGRAM MAIN
+ END
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst | 2 +-
Help/release/dev/fortran-compiler-launcher.rst | 8 ++++++++
Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst | 3 ++-
Modules/FindBoost.cmake | 8 +++-----
Modules/GNUInstallDirs.cmake | 2 +-
Modules/Platform/UnixPaths.cmake | 3 +++
Source/cmMakefileTargetGenerator.cxx | 4 ++--
Source/cmNinjaTargetGenerator.cxx | 2 +-
Source/cmTarget.cxx | 1 +
Templates/TestDriver.cxx.in | 4 ++--
Tests/RunCMake/CMakeLists.txt | 3 +++
.../{C-Build-stdout.txt => Fortran-Build-stdout.txt} | 0
.../{C-Build-stdout.txt => Fortran-launch-Build-stdout.txt} | 0
.../C-launch.cmake => CompilerLauncher/Fortran-launch.cmake} | 2 +-
Tests/RunCMake/CompilerLauncher/Fortran.cmake | 4 ++++
Tests/RunCMake/CompilerLauncher/RunCMakeTest.cmake | 3 +++
Tests/RunCMake/CompilerLauncher/main.F | 2 ++
17 files changed, 37 insertions(+), 14 deletions(-)
create mode 100644 Help/release/dev/fortran-compiler-launcher.rst
copy Tests/RunCMake/CompilerLauncher/{C-Build-stdout.txt =>
Fortran-Build-stdout.txt} (100%)
copy Tests/RunCMake/CompilerLauncher/{C-Build-stdout.txt =>
Fortran-launch-Build-stdout.txt} (100%)
copy Tests/RunCMake/{ClangTidy/C-launch.cmake =>
CompilerLauncher/Fortran-launch.cmake} (70%)
create mode 100644 Tests/RunCMake/CompilerLauncher/Fortran.cmake
create mode 100644 Tests/RunCMake/CompilerLauncher/main.F
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
