[Cmake-commits] CMake branch, master, updated. v3.11.0-rc4-329-g6792c77
Kitware Robot
kwrobot at kitware.com
Mon Mar 26 08:05:04 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 6792c7787aedc0fb2a32b6ca563917f7447f2e80 (commit)
via 0e323aad431044ccf60d72cb951563f78c688b66 (commit)
via ee78f4e1daf72735d608e22f0c99c5e28a640601 (commit)
via 911972903b7cfdb4a0ff356ae43352822b5bbd76 (commit)
via 51b642679bc5dc675ab0e4e3fe7dc4c053ba60f4 (commit)
via 850cfe3a3b58db3bf76e5d5d6a2583f3849ab3e8 (commit)
via 20c204244b4000dc209da42a1b2a39c06c454419 (commit)
via 53e3080be3a622bf4e720a03da2d3b34a4101be6 (commit)
from 89fd296ef25d359a1c7be42fe6ccfc4265821bb3 (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=6792c7787aedc0fb2a32b6ca563917f7447f2e80
commit 6792c7787aedc0fb2a32b6ca563917f7447f2e80
Merge: 0e323aa 51b6426
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 26 12:01:51 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 26 08:01:57 2018 -0400
Merge topic 'UseSWIG-fix-library-prefix'
51b642679b UseSWIG: fix prefix library for Java on Windows
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Merge-request: !1871
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e323aad431044ccf60d72cb951563f78c688b66
commit 0e323aad431044ccf60d72cb951563f78c688b66
Merge: ee78f4e 850cfe3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 26 12:00:34 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 26 08:01:00 2018 -0400
Merge topic 'bootstrap-var-options'
850cfe3a3b bootstrap: Add support for VAR=value options to specify tools and flags
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1859
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee78f4e1daf72735d608e22f0c99c5e28a640601
commit ee78f4e1daf72735d608e22f0c99c5e28a640601
Merge: 9119729 20c2042
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 26 12:00:15 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 26 08:00:21 2018 -0400
Merge topic 'pr.checksymbol'
20c204244b CheckSymbolExists: Fix CMP0054 warning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1884
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=911972903b7cfdb4a0ff356ae43352822b5bbd76
commit 911972903b7cfdb4a0ff356ae43352822b5bbd76
Merge: 89fd296 53e3080
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 26 11:58:12 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 26 07:58:22 2018 -0400
Merge topic 'contract-plplot'
53e3080be3 Tests: Restore PLplot contract test repository https URL
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1883
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51b642679bc5dc675ab0e4e3fe7dc4c053ba60f4
commit 51b642679bc5dc675ab0e4e3fe7dc4c053ba60f4
Author: Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Tue Mar 20 10:56:28 2018 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 22 11:18:17 2018 -0400
UseSWIG: fix prefix library for Java on Windows
Fixes: #17836
diff --git a/Help/release/dev/UseSWIG-fix-library-prefix.rst b/Help/release/dev/UseSWIG-fix-library-prefix.rst
new file mode 100644
index 0000000..7ff0f49
--- /dev/null
+++ b/Help/release/dev/UseSWIG-fix-library-prefix.rst
@@ -0,0 +1,6 @@
+UseSWIG-fix-library-prefix
+--------------------------
+
+* The :module:`UseSWIG` module :command:`swig_add_library` command
+ (and legacy ``swig_add_module`` command) now set the prefix of
+ Java modules to ``""`` for MINGW, MSYS, and CYGWIN environments.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 6d35d1b..8e7ca41 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -507,15 +507,18 @@ function(SWIG_ADD_LIBRARY name)
elseif (swig_lowercase_language STREQUAL "go")
set_target_properties(${name} PROPERTIES PREFIX "")
elseif (swig_lowercase_language STREQUAL "java")
+ # In java you want:
+ # System.loadLibrary("LIBRARY");
+ # then JNI will look for a library whose name is platform dependent, namely
+ # MacOS : libLIBRARY.jnilib
+ # Windows: LIBRARY.dll
+ # Linux : libLIBRARY.so
if (APPLE)
- # In java you want:
- # System.loadLibrary("LIBRARY");
- # then JNI will look for a library whose name is platform dependent, namely
- # MacOS : libLIBRARY.jnilib
- # Windows: LIBRARY.dll
- # Linux : libLIBRARY.so
- set_target_properties (${name} PROPERTIES SUFFIX ".jnilib")
- endif ()
+ set_target_properties (${name} PROPERTIES SUFFIX ".jnilib")
+ endif()
+ if ((WIN32 AND MINGW) OR CYGWIN OR CMAKE_SYSTEM_NAME STREQUAL MSYS)
+ set_target_properties(${name} PROPERTIES PREFIX "")
+ endif()
elseif (swig_lowercase_language STREQUAL "lua")
if(_SAM_TYPE STREQUAL "MODULE")
set_target_properties(${name} PROPERTIES PREFIX "")
@@ -560,11 +563,16 @@ function(SWIG_ADD_LIBRARY name)
# target property SWIG_SUPPORT_FILES lists proxy support files
if (NOT SWIG_MODULE_${name}_NOPROXY)
string(TOUPPER "${_SAM_LANGUAGE}" swig_uppercase_language)
+ set(swig_all_support_files)
foreach (swig_it IN LISTS SWIG_${swig_uppercase_language}_EXTRA_FILE_EXTENSIONS)
set (swig_support_files ${swig_generated_sources})
list (FILTER swig_support_files INCLUDE REGEX ".*${swig_it}$")
- set_property (TARGET ${name} APPEND PROPERTY SWIG_SUPPORT_FILES ${swig_support_files})
+ list(APPEND swig_all_support_files ${swig_support_files})
endforeach()
+ if (swig_all_support_files)
+ list(REMOVE_DUPLICATES swig_all_support_files)
+ endif()
+ set_property (TARGET ${name} APPEND PROPERTY SWIG_SUPPORT_FILES ${swig_all_support_files})
endif()
# to ensure legacy behavior, export some variables
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=850cfe3a3b58db3bf76e5d5d6a2583f3849ab3e8
commit 850cfe3a3b58db3bf76e5d5d6a2583f3849ab3e8
Author: James Lee <princetemp at outlook.com>
AuthorDate: Tue Mar 20 13:34:42 2018 +0800
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 22 10:52:16 2018 -0400
bootstrap: Add support for VAR=value options to specify tools and flags
diff --git a/bootstrap b/bootstrap
index d152c34..3d5b0d0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -821,6 +821,11 @@ while test $# != 0; do
--version) cmake_version_display ; exit 2 ;;
--verbose) cmake_verbose=TRUE ;;
--enable-ccache) cmake_ccache_enabled=TRUE ;;
+ CC=*) CC=`cmake_arg "$1"` ;;
+ CXX=*) CXX=`cmake_arg "$1"` ;;
+ CFLAGS=*) CFLAGS=`cmake_arg "$1"` ;;
+ CXXFLAGS=*) CXXFLAGS=`cmake_arg "$1"` ;;
+ LDFLAGS=*) LDFLAGS=`cmake_arg "$1"` ;;
--) shift; break ;;
*) die "Unknown option: $1" ;;
esac
@@ -1535,6 +1540,9 @@ MAKE="${cmake_make_processor}"
export CC
export CXX
export MAKE
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
# Run bootstrap CMake to configure real CMake
cmake_options="-DCMAKE_BOOTSTRAP=1"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20c204244b4000dc209da42a1b2a39c06c454419
commit 20c204244b4000dc209da42a1b2a39c06c454419
Author: Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Thu Mar 22 15:32:43 2018 +0300
Commit: Ruslan Baratov <ruslan_baratov at yahoo.com>
CommitDate: Thu Mar 22 15:32:43 2018 +0300
CheckSymbolExists: Fix CMP0054 warning
diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake
index d9c9ae4..3483121 100644
--- a/Modules/CheckSymbolExists.cmake
+++ b/Modules/CheckSymbolExists.cmake
@@ -45,6 +45,9 @@ the way the check is run:
include_guard(GLOBAL)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+
macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
if(CMAKE_C_COMPILER_LOADED)
__CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.c" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
@@ -116,3 +119,5 @@ macro(__CHECK_SYMBOL_EXISTS_IMPL SOURCEFILE SYMBOL FILES VARIABLE)
endif()
endif()
endmacro()
+
+cmake_policy(POP)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53e3080be3a622bf4e720a03da2d3b34a4101be6
commit 53e3080be3a622bf4e720a03da2d3b34a4101be6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 22 07:08:35 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 22 07:08:35 2018 -0400
Tests: Restore PLplot contract test repository https URL
Switch back to the `https://` repository URL but without the `.git`
extensions. It seems faster than the `git://` protocol for this server.
diff --git a/Tests/Contracts/PLplot/CMakeLists.txt b/Tests/Contracts/PLplot/CMakeLists.txt
index 7051d62..8e95ba3 100644
--- a/Tests/Contracts/PLplot/CMakeLists.txt
+++ b/Tests/Contracts/PLplot/CMakeLists.txt
@@ -9,7 +9,7 @@ if(NOT PLplot_GIT_TAG)
set(PLplot_GIT_TAG "plplot-5.13.0")
endif()
ExternalProject_Add(PLplot
- GIT_REPOSITORY "git://git.code.sf.net/p/plplot/plplot"
+ GIT_REPOSITORY "https://git.code.sf.net/p/plplot/plplot"
GIT_TAG "${PLplot_GIT_TAG}"
PREFIX "${PLplot_PREFIX}"
CMAKE_ARGS
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/UseSWIG-fix-library-prefix.rst | 6 ++++++
Modules/CheckSymbolExists.cmake | 5 +++++
Modules/UseSWIG.cmake | 26 +++++++++++++++--------
Tests/Contracts/PLplot/CMakeLists.txt | 2 +-
bootstrap | 8 +++++++
5 files changed, 37 insertions(+), 10 deletions(-)
create mode 100644 Help/release/dev/UseSWIG-fix-library-prefix.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list