[Cmake-commits] CMake branch, master, updated. v3.12.0-373-gd64e41a
Kitware Robot
kwrobot at kitware.com
Mon Aug 6 08:25:11 EDT 2018
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 d64e41ac486847e74ff1c07bc2a80edbf63827fd (commit)
via 7f981dcf0e6d0a1c01c49c0245218949fcfa75b6 (commit)
via be095b3e7fcaf3773a994f546adafb383324e78b (commit)
via bed7ee11b7b080e49fbdc107674140eecd4cd5b1 (commit)
via 66be4621dabd86764bb007eabf605408626a7079 (commit)
via 7142041abdebbdc677f7f859b03e12f68b8d0825 (commit)
via 117d9f557042aa3a178e059cb038eaf0cb399b0a (commit)
via 3a2c736b41fb394b389607b0ccf96611c42319f5 (commit)
via c7769867d6e195b5361c77ea54393c9cfaa12f94 (commit)
via 37ba34c0b0270a09ca935d271f1742aea219070f (commit)
via 10d6c3a635fbcf84871dce3351156890ce566d1c (commit)
via c2856e0b2b58c0c9cb4c089570009d517720812c (commit)
via f34f6eb3d160d500c5c5e2cba131d64c75aa046a (commit)
via 3434c22c290887a47bd70d6315aba8082a77110a (commit)
from e19453d8ec91d7694ceb4729d68574ccd183476e (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=d64e41ac486847e74ff1c07bc2a80edbf63827fd
commit d64e41ac486847e74ff1c07bc2a80edbf63827fd
Merge: 7f981dc 10d6c3a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:24:33 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:24:43 2018 -0400
Merge topic 'nag-fortran-rsp'
10d6c3a635 NAG: Pass response files through front-end to the linker
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2250
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f981dcf0e6d0a1c01c49c0245218949fcfa75b6
commit 7f981dcf0e6d0a1c01c49c0245218949fcfa75b6
Merge: be095b3 c2856e0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:23:37 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:24:04 2018 -0400
Merge topic 'xl-exe-pic'
c2856e0b2b XL: Use -qpic for position independent executables
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2249
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be095b3e7fcaf3773a994f546adafb383324e78b
commit be095b3e7fcaf3773a994f546adafb383324e78b
Merge: bed7ee1 f34f6eb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:22:42 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:23:14 2018 -0400
Merge topic 'FindMatlab-mcc'
f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2233
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bed7ee11b7b080e49fbdc107674140eecd4cd5b1
commit bed7ee11b7b080e49fbdc107674140eecd4cd5b1
Merge: 66be4621 3434c22
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:22:19 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:22:28 2018 -0400
Merge topic 'FindMatlab-cross-compile'
3434c22c29 FindMatlab: only search registry on windows hosts
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2248
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66be4621dabd86764bb007eabf605408626a7079
commit 66be4621dabd86764bb007eabf605408626a7079
Merge: 7142041 c776986
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 08:21:11 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 6 08:21:11 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7142041abdebbdc677f7f859b03e12f68b8d0825
commit 7142041abdebbdc677f7f859b03e12f68b8d0825
Merge: 117d9f5 37ba34c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:20:49 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:20:54 2018 -0400
Merge topic 'cuda-arch-version'
37ba34c0b0 FindCUDA/select_compute_arch: Restore two-component CUDA_VERSION
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2251
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=117d9f557042aa3a178e059cb038eaf0cb399b0a
commit 117d9f557042aa3a178e059cb038eaf0cb399b0a
Merge: e19453d 3a2c736
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 6 12:19:33 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 6 08:19:40 2018 -0400
Merge topic 'check-unique_ptr-pgi'
3a2c736b41 Extend C++17/C++14 feature checks to require unique_ptr
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2252
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a2c736b41fb394b389607b0ccf96611c42319f5
commit 3a2c736b41fb394b389607b0ccf96611c42319f5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 1 14:01:47 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 1 14:03:43 2018 -0400
Extend C++17/C++14 feature checks to require unique_ptr
When testing compiler modes higher than C++11 for constructs we need,
include a check for using `unique_ptr` in that mode. The PGI 18.4
compiler in some environments supports `unique_ptr` in C++11 mode
but is broken for C++14 and C++17. Check that `unique_ptr` works
in these modes before using one.
diff --git a/Source/Checks/cm_cxx14_check.cmake b/Source/Checks/cm_cxx14_check.cmake
index a78ba35..38606b9 100644
--- a/Source/Checks/cm_cxx14_check.cmake
+++ b/Source/Checks/cm_cxx14_check.cmake
@@ -1,5 +1,5 @@
set(CMake_CXX14_BROKEN 0)
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|PGI")
if(NOT CMAKE_CXX14_STANDARD_COMPILE_OPTION)
set(CMake_CXX14_WORKS 0)
endif()
diff --git a/Source/Checks/cm_cxx14_check.cpp b/Source/Checks/cm_cxx14_check.cpp
index f5806a9..9369ba2 100644
--- a/Source/Checks/cm_cxx14_check.cpp
+++ b/Source/Checks/cm_cxx14_check.cpp
@@ -1,5 +1,8 @@
#include <cstdio>
+#include <memory>
+
int main()
{
- return 0;
+ std::unique_ptr<int> u(new int(0));
+ return *u;
}
diff --git a/Source/Checks/cm_cxx17_check.cmake b/Source/Checks/cm_cxx17_check.cmake
index 83d3971..4da2fd7 100644
--- a/Source/Checks/cm_cxx17_check.cmake
+++ b/Source/Checks/cm_cxx17_check.cmake
@@ -1,5 +1,5 @@
set(CMake_CXX17_BROKEN 0)
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|PGI")
if(NOT CMAKE_CXX17_STANDARD_COMPILE_OPTION)
set(CMake_CXX17_WORKS 0)
endif()
diff --git a/Source/Checks/cm_cxx17_check.cpp b/Source/Checks/cm_cxx17_check.cpp
index 2cbf1d5..4e89184 100644
--- a/Source/Checks/cm_cxx17_check.cpp
+++ b/Source/Checks/cm_cxx17_check.cpp
@@ -1,7 +1,9 @@
#include <cstdio>
+#include <memory>
#include <unordered_map>
int main()
{
- return 0;
+ std::unique_ptr<int> u(new int(0));
+ return *u;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d6c3a635fbcf84871dce3351156890ce566d1c
commit 10d6c3a635fbcf84871dce3351156890ce566d1c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 1 13:28:25 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 1 13:28:45 2018 -0400
NAG: Pass response files through front-end to the linker
The `nagfor` compiler front-end does not support the `@rspfile` syntax.
Use `-Wl, at rspfile` instead to pass it through to the linker.
Fixes: #18232
diff --git a/Modules/Compiler/NAG-Fortran.cmake b/Modules/Compiler/NAG-Fortran.cmake
index 39aae18..9973feb 100644
--- a/Modules/Compiler/NAG-Fortran.cmake
+++ b/Modules/Compiler/NAG-Fortran.cmake
@@ -34,3 +34,4 @@ set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed")
set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free")
set(CMAKE_Fortran_COMPILE_OPTIONS_PIC "-PIC")
set(CMAKE_Fortran_COMPILE_OPTIONS_PIE "-PIC")
+set(CMAKE_Fortran_RESPONSE_FILE_LINK_FLAG "-Wl,@")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2856e0b2b58c0c9cb4c089570009d517720812c
commit c2856e0b2b58c0c9cb4c089570009d517720812c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 1 11:56:31 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 1 11:59:50 2018 -0400
XL: Use -qpic for position independent executables
The XL compiler does not have a dedicated "pie" option so use at least
`-qpic`. This missing setting was exposed by the `ExportImport` and
`PositionIndependentTargets` tests with XL on an ELF platform.
diff --git a/Modules/Compiler/XL.cmake b/Modules/Compiler/XL.cmake
index a1d7ca1..21fe5e8 100644
--- a/Modules/Compiler/XL.cmake
+++ b/Modules/Compiler/XL.cmake
@@ -20,6 +20,7 @@ macro(__compiler_xl lang)
# Feature flags.
set(CMAKE_${lang}_VERBOSE_FLAG "-V")
set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-qpic")
+ set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-qpic")
set(CMAKE_${lang}_RESPONSE_FILE_FLAG "-qoptfile=")
set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "-qoptfile=")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f34f6eb3d160d500c5c5e2cba131d64c75aa046a
commit f34f6eb3d160d500c5c5e2cba131d64c75aa046a
Author: Jason Heeris <jason.heeris at gmail.com>
AuthorDate: Tue Jul 24 13:56:01 2018 +1000
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 1 09:23:46 2018 -0400
FindMatlab: Add component to find MCC, the Matlab compiler
Add component `MCC_COMPILER` to request searching for the Matlab
compiler. Report it in `Matlab_MCC_COMPILER` if it is found.
Issue: #18183
diff --git a/Help/release/dev/FindMatlab-mcc.rst b/Help/release/dev/FindMatlab-mcc.rst
new file mode 100644
index 0000000..71387f3
--- /dev/null
+++ b/Help/release/dev/FindMatlab-mcc.rst
@@ -0,0 +1,5 @@
+FindMatlab-mcc
+--------------
+
+* The :module:`FindMatlab` module gained a new ``MCC_COMPILER``
+ component to request finding the Matlab Compiler add-on.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 54e62db..5b60c6a 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -25,6 +25,7 @@
# available on the MCR version, and will yield an error if the MCR is found
# instead of the regular Matlab installation.
# * ``MEX_COMPILER`` the MEX compiler.
+# * ``MCC_COMPILER`` the MCC compiler, included with the Matlab Compiler add-on.
# * ``SIMULINK`` the Simulink environment.
#
# .. note::
@@ -110,7 +111,10 @@
# the whole set of libraries of Matlab
# ``Matlab_MEX_COMPILER``
# the mex compiler of Matlab. Currently not used.
-# Available only if the component ``MEX_COMPILER`` is asked
+# Available only if the component ``MEX_COMPILER`` is requested.
+# ``Matlab_MCC_COMPILER``
+# the mcc compiler of Matlab. Included with the Matlab Compiler add-on.
+# Available only if the component ``MCC_COMPILER`` is requested.
#
# Cached variables
# """"""""""""""""
@@ -1420,6 +1424,7 @@ if(DEFINED Matlab_ROOT_DIR_LAST_CACHED)
Matlab_INCLUDE_DIRS
Matlab_MEX_LIBRARY
Matlab_MEX_COMPILER
+ Matlab_MCC_COMPILER
Matlab_MAIN_PROGRAM
Matlab_MX_LIBRARY
Matlab_ENG_LIBRARY
@@ -1660,6 +1665,22 @@ if(_matlab_find_simulink GREATER -1)
endif()
unset(_matlab_find_simulink)
+# component MCC Compiler
+list(FIND Matlab_FIND_COMPONENTS MCC_COMPILER _matlab_find_mcc_compiler)
+if(_matlab_find_mcc_compiler GREATER -1)
+ find_program(
+ Matlab_MCC_COMPILER
+ "mcc"
+ PATHS ${Matlab_BINARIES_DIR}
+ DOC "Matlab MCC compiler"
+ NO_DEFAULT_PATH
+ )
+ if(Matlab_MCC_COMPILER)
+ set(Matlab_MCC_COMPILER_FOUND TRUE)
+ endif()
+endif()
+unset(_matlab_find_mcc_compiler)
+
unset(_matlab_lib_dir_for_search)
set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${Matlab_ENG_LIBRARY} ${Matlab_MAT_LIBRARY})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3434c22c290887a47bd70d6315aba8082a77110a
commit 3434c22c290887a47bd70d6315aba8082a77110a
Author: Julien Schueller <schueller at phimeca.com>
AuthorDate: Wed Aug 1 07:40:25 2018 -0400
Commit: Julien Schueller <schueller at phimeca.com>
CommitDate: Wed Aug 1 07:40:25 2018 -0400
FindMatlab: only search registry on windows hosts
From Linux, it fails when cross-compiling
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 54e62db..ddf22d1 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -1369,7 +1369,7 @@ else()
# if the user does not specify the possible installation root, we look for
# one installation using the appropriate heuristics.
# There is apparently no standard way on Linux.
- if(WIN32)
+ if(CMAKE_HOST_WIN32)
_Matlab_find_instances_win32(_matlab_possible_roots_win32)
list(APPEND _matlab_possible_roots ${_matlab_possible_roots_win32})
elseif(APPLE)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindMatlab-mcc.rst | 5 +++++
Modules/Compiler/NAG-Fortran.cmake | 1 +
Modules/Compiler/XL.cmake | 1 +
Modules/FindCUDA/select_compute_arch.cmake | 5 +++--
Modules/FindMatlab.cmake | 25 +++++++++++++++++++++++--
Source/Checks/cm_cxx14_check.cmake | 2 +-
Source/Checks/cm_cxx14_check.cpp | 5 ++++-
Source/Checks/cm_cxx17_check.cmake | 2 +-
Source/Checks/cm_cxx17_check.cpp | 4 +++-
9 files changed, 42 insertions(+), 8 deletions(-)
create mode 100644 Help/release/dev/FindMatlab-mcc.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list