[Cmake-commits] CMake branch, master, updated. v3.10.0-392-gdaeadde
Kitware Robot
kwrobot at kitware.com
Tue Nov 21 06:05:04 EST 2017
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 daeadde88871f4e2473ce429f459ae8d6ed0ffb8 (commit)
via 65c5833858a92dc15978f08fe2acdf852c930ee6 (commit)
via 8f8f118327e25a3af912b504dcb3ebad5c841818 (commit)
via 8e7e7af5c8b3ce20a5d6d449b74b861c71f86842 (commit)
via 9b503cc86e047fb8d9929e49f96f82f2a74af562 (commit)
via f81d186b156af01027e76cb8407a3ae64ad74991 (commit)
from e91e69cfb5a9bdb1cad7a6442913c15af88ce5ad (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=daeadde88871f4e2473ce429f459ae8d6ed0ffb8
commit daeadde88871f4e2473ce429f459ae8d6ed0ffb8
Merge: 65c5833 8e7e7af
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Tue Nov 21 10:56:00 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 21 05:56:03 2017 -0500
Merge topic 'irsl-intel-1041-folder'
8e7e7af5 IRSL: Install the 1041 folder for Intel compilers
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1509
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65c5833858a92dc15978f08fe2acdf852c930ee6
commit 65c5833858a92dc15978f08fe2acdf852c930ee6
Merge: 8f8f118 f81d186
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Tue Nov 21 10:55:20 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 21 05:55:40 2017 -0500
Merge topic 'findqt4-dirs-fix'
f81d186b FindQt4: Set PLUGINS and IMPORTS dir even if empty
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1503
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f8f118327e25a3af912b504dcb3ebad5c841818
commit 8f8f118327e25a3af912b504dcb3ebad5c841818
Merge: e91e69c 9b503cc
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Tue Nov 21 10:55:02 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 21 05:55:12 2017 -0500
Merge topic 'wxwidgets-env-variables'
9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1504
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e7e7af5c8b3ce20a5d6d449b74b861c71f86842
commit 8e7e7af5c8b3ce20a5d6d449b74b861c71f86842
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Nov 20 16:35:02 2017 +0100
Commit: Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Nov 20 16:35:02 2017 +0100
IRSL: Install the 1041 folder for Intel compilers
The presence of the `1041` seems to solely depend on whether a given
Intel compiler release was available in Japanese or not. Install it if
it is present and silently ignore it otherwise.
Example: The Intel 2018.0 release did not ship it, but the 2018.1
compilers have it.
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 1ba4877..38e0861 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -594,8 +594,11 @@ if(_IRSL_HAVE_Intel)
endif()
if(WIN32)
set(__install_dirs "${_Intel_redistdir}/1033")
+ if(EXISTS "${_Intel_redistdir}/1041")
+ list(APPEND __install_dirs "${_Intel_redistdir}/1041")
+ endif()
if(_Intel_compiler_ver VERSION_LESS 18)
- list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c" "${_Intel_redistdir}/1041")
+ list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c")
endif()
foreach(__Intel_lib IN ITEMS cilkrts20.dll libchkp.dll libgfxoffload.dll libioffload_host.dll libirngmd.dll
libmmd.dll libmmdd.dll libmpx.dll liboffload.dll svml_dispmd.dll)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b503cc86e047fb8d9929e49f96f82f2a74af562
commit 9b503cc86e047fb8d9929e49f96f82f2a74af562
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Sun Nov 19 23:05:31 2017 +0100
Commit: Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Sun Nov 19 23:05:31 2017 +0100
wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars
Issue: #17492
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index e08afe4..e21ec38 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -751,7 +751,7 @@ else()
#-----------------------------------------------------------------
# Support cross-compiling, only search in the target platform.
find_program(wxWidgets_CONFIG_EXECUTABLE
- NAMES wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8
+ NAMES $ENV{WX_CONFIG} wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8
DOC "Location of wxWidgets library configuration provider binary (wx-config)."
ONLY_CMAKE_FIND_ROOT_PATH
)
@@ -964,8 +964,9 @@ find_package_handle_standard_args(wxWidgets
#=====================================================================
# Resource file compiler.
-find_program(wxWidgets_wxrc_EXECUTABLE wxrc
- ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
+find_program(wxWidgets_wxrc_EXECUTABLE
+ NAMES $ENV{WXRC_CMD} wxrc
+ PATHS ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
DOC "Location of wxWidgets resource file compiler binary (wxrc)"
)
diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake
index 054a1bf..115cdc6 100644
--- a/Modules/FindwxWindows.cmake
+++ b/Modules/FindwxWindows.cmake
@@ -617,7 +617,8 @@ else()
# wx-config should be in your path anyhow, usually no need to set WXWIN or
# search in ../wx or ../../wx
- find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
+ find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE
+ NAMES $ENV{WX_CONFIG} wx-config
HINTS
ENV WXWIN
$ENV{WXWIN}/bin
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f81d186b156af01027e76cb8407a3ae64ad74991
commit f81d186b156af01027e76cb8407a3ae64ad74991
Author: Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Sun Nov 19 22:54:24 2017 +0100
Commit: Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Sun Nov 19 22:54:24 2017 +0100
FindQt4: Set PLUGINS and IMPORTS dir even if empty
Fixes: #14155
Issue: #17492
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index c67d0be..714e4af 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -709,13 +709,19 @@ if (QT_QMAKE_EXECUTABLE AND
if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
_qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir)
set(QT_PLUGINS_DIR NOTFOUND)
+ set(qt_cross_paths)
foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins")
endforeach()
- find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
+ find_path(QT_PLUGINS_DIR
+ NAMES accessible bearer codecs designer graphicssystems iconengines imageformats inputmethods qmltooling script sqldrivers
HINTS ${qt_cross_paths} ${qt_plugins_dir}
DOC "The location of the Qt plugins"
NO_CMAKE_FIND_ROOT_PATH)
+ # If no plugins were installed, set QT_PLUGINS_DIR to ${qt_plugins_dir}
+ if(NOT QT_PLUGINS_DIR AND qt_plugins_dir)
+ set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
+ endif()
endif ()
# ask qmake for the translations directory
@@ -729,6 +735,7 @@ if (QT_QMAKE_EXECUTABLE AND
_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
if(qt_imports_dir)
set(QT_IMPORTS_DIR NOTFOUND)
+ set(qt_cross_paths)
foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
endforeach()
@@ -738,6 +745,10 @@ if (QT_QMAKE_EXECUTABLE AND
NO_CMAKE_FIND_ROOT_PATH
NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_SYSTEM_PATH)
+ # If the imports folder is empty, set QT_IMPORTS_DIR to ${qt_imports_dir}
+ if(NOT QT_IMPORTS_DIR AND qt_imports_dir)
+ set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports")
+ endif()
mark_as_advanced(QT_IMPORTS_DIR)
endif()
endif ()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 13 ++++++++++++-
Modules/FindwxWidgets.cmake | 7 ++++---
Modules/FindwxWindows.cmake | 3 ++-
Modules/InstallRequiredSystemLibraries.cmake | 5 ++++-
4 files changed, 22 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list