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 4a68c85073f80fd8f96c93eb5b3ead3058c84391 (commit)
via 2921c5e4d102a3429b1e36ffd15715edaa46ef3f (commit)
via 96bc0a5d99b66868f12eb5da94c083c19fa4ebc5 (commit)
via 3d025939868a9722e889e3b4361b56d4c4138025 (commit)
via 14ac253af716432d20380d155131fa6fd6d03400 (commit)
via b21e4e4a1511417956b1d6d07f49425747c400e2 (commit)
via 333a2ff0990f73b1d8242d55777c497626afeaea (commit)
via 7cccc5b199b5b9e2ee488d1639f37a75ab4a89d6 (commit)
via ac9934406da6793a8c841db6d53f292f65124ed7 (commit)
from 53dedbd51e985ca515b7454520b7c5edd2eaf912 (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=4a68c85073f80fd8f96c93eb5b3ead3058c84391
commit 4a68c85073f80fd8f96c93eb5b3ead3058c84391
Merge: 2921c5e 3d02593
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 3 13:10:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 3 09:10:50 2019 -0400
Merge topic 'FindJava-all-versions'
3d02593986 FindJava: ensure all versions can be found
14ac253af7 FindJava: tests clean-up
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3871
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2921c5e4d102a3429b1e36ffd15715edaa46ef3f
commit 2921c5e4d102a3429b1e36ffd15715edaa46ef3f
Merge: 96bc0a5 b21e4e4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 3 09:09:50 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 3 09:09:50 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96bc0a5d99b66868f12eb5da94c083c19fa4ebc5
commit 96bc0a5d99b66868f12eb5da94c083c19fa4ebc5
Merge: 53dedbd 333a2ff
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 3 13:08:56 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 3 09:09:04 2019 -0400
Merge topic 'xcode-scheme-custom-target'
333a2ff099 Merge branch 'backport-xcode-scheme-custom-target'
7cccc5b199 Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets
ac9934406d Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3878
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d025939868a9722e889e3b4361b56d4c4138025
commit 3d025939868a9722e889e3b4361b56d4c4138025
Author: Marc Chevrier <marc.chevr...@gmail.com>
AuthorDate: Tue Oct 1 12:44:26 2019 +0200
Commit: Marc Chevrier <marc.chevr...@gmail.com>
CommitDate: Wed Oct 2 14:47:11 2019 +0200
FindJava: ensure all versions can be found
Fixes: #19765
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 237ea96..3a5bd31 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -143,7 +143,7 @@ endif()
if (WIN32)
set (_JNI_HINTS)
- execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+ execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK
RESULT_VARIABLE _JNI_RESULT
OUTPUT_VARIABLE _JNI_VERSIONS
ERROR_QUIET)
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 0d62cd6..945df3c 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -85,7 +85,7 @@ if(_JAVA_HOME)
endif()
if (WIN32)
macro (_JAVA_GET_INSTALLED_VERSIONS _KIND)
- execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\${_KIND} /f
"." /k
+ execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\${_KIND}
RESULT_VARIABLE _JAVA_RESULT
OUTPUT_VARIABLE _JAVA_VERSIONS
ERROR_QUIET)
@@ -153,7 +153,7 @@ find_program(Java_JAVA_EXECUTABLE
)
if(Java_JAVA_EXECUTABLE)
- execute_process(COMMAND ${Java_JAVA_EXECUTABLE} -version
+ execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -version
RESULT_VARIABLE res
OUTPUT_VARIABLE var
ERROR_VARIABLE var # sun-java output to stderr
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14ac253af716432d20380d155131fa6fd6d03400
commit 14ac253af716432d20380d155131fa6fd6d03400
Author: Marc Chevrier <marc.chevr...@gmail.com>
AuthorDate: Tue Oct 1 12:40:35 2019 +0200
Commit: Marc Chevrier <marc.chevr...@gmail.com>
CommitDate: Wed Oct 2 14:47:11 2019 +0200
FindJava: tests clean-up
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 789fc0e..ed20b91 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3349,81 +3349,45 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir
dev -- '${CMake_BUILD_NIGH
if(JNI_H AND EXISTS "${JNI_H}") # in case jni.h is a broken symlink
file(READ "${JNI_H}" JNI_FILE)
if("${JNI_FILE}" MATCHES "JDK1_2")
- add_test(Java.Jar ${CMAKE_CTEST_COMMAND}
+ add_test(NAME Java.Jar COMMAND ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Java"
"${CMake_BINARY_DIR}/Tests/JavaJar"
${build_generator_args}
--build-project hello
- --build-target hello
- --build-two-config
--build-run-dir "${CMake_BINARY_DIR}/Tests/JavaJar/"
- --test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIG>)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/JavaJar")
- add_test(Java.JarSourceList ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/Java"
- "${CMake_BINARY_DIR}/Tests/JavaJarSourceList"
- ${build_generator_args}
- --build-project hello
- --build-target hello2
- --build-two-config
- --build-run-dir "${CMake_BINARY_DIR}/Tests/JavaJarSourceList/"
- --test-command ${JAVA_RUNTIME} -classpath hello2.jar HelloWorld)
- list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/JavaJarSourceList")
- add_test(Java.JarSourceListAndOutput ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/Java"
- "${CMake_BINARY_DIR}/Tests/JavaJarSourceListAndOutput"
- ${build_generator_args}
- --build-project hello
- --build-target hello3
- --build-two-config
- --build-run-dir
"${CMake_BINARY_DIR}/Tests/JavaJarSourceListAndOutput/hello3"
- --test-command ${JAVA_RUNTIME} -classpath hello3.jar HelloWorld)
- list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/JavaJarSourceListAndOutput")
# For next tests, java tool must have same architecture as toolchain
math(EXPR _object_mode "${CMAKE_SIZEOF_VOID_P} * 8")
execute_process(
- COMMAND "${Java_JAVA_EXECUTABLE}" -d${_object_mode} -version
- OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE _result
+ COMMAND "${Java_JAVA_EXECUTABLE}" -version
+ OUTPUT_VARIABLE _version ERROR_VARIABLE _version RESULT_VARIABLE
_result
)
- if(_result EQUAL 0)
+ if(_result EQUAL 0 AND _version MATCHES "${_object_mode}-Bit")
## next test is valid only if Java version is less than 1.10
if ("${Java_VERSION}" VERSION_LESS 1.10)
- if(_isMultiConfig)
- set (JAVAH_LIBRARY_PATH
${CMake_BINARY_DIR}/Tests/JavaJavah/$<CONFIGURATION>)
- else()
- set (JAVAH_LIBRARY_PATH ${CMake_BINARY_DIR}/Tests/JavaJavah)
- endif()
add_test(NAME Java.Javah COMMAND ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/JavaJavah"
"${CMake_BINARY_DIR}/Tests/JavaJavah"
${build_generator_args}
--build-project helloJavah
- --build-two-config
--build-run-dir "${CMake_BINARY_DIR}/Tests/JavaJavah/"
- --test-command ${JAVA_RUNTIME}
-Djava.library.path=${JAVAH_LIBRARY_PATH} -classpath hello3.jar HelloWorld2)
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIG>)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/JavaJavah")
endif()
## next test is valid only if Java is, at least, version 1.8
if (NOT "${Java_VERSION}" VERSION_LESS 1.8)
- if(_isMultiConfig)
- set (JAVANATIVEHEADERS_LIBRARY_PATH
${CMake_BINARY_DIR}/Tests/JavaNativeHeaders/$<CONFIGURATION>)
- else()
- set (JAVANATIVEHEADERS_LIBRARY_PATH
${CMake_BINARY_DIR}/Tests/JavaNativeHeaders)
- endif()
add_test(NAME Java.NativeHeaders COMMAND ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/JavaNativeHeaders"
"${CMake_BINARY_DIR}/Tests/JavaNativeHeaders"
${build_generator_args}
--build-project helloJavaNativeHeaders
- --build-two-config
--build-run-dir "${CMake_BINARY_DIR}/Tests/JavaNativeHeaders/"
- --test-command ${JAVA_RUNTIME}
-Djava.library.path=${JAVANATIVEHEADERS_LIBRARY_PATH} -classpath hello4.jar
HelloWorld3)
+ --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIG>)
list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/JavaNativeHeaders")
endif()
endif()
diff --git a/Tests/Java/CMakeLists.txt b/Tests/Java/CMakeLists.txt
index 0b8269b..aea4282 100644
--- a/Tests/Java/CMakeLists.txt
+++ b/Tests/Java/CMakeLists.txt
@@ -3,6 +3,8 @@ project(hello Java)
cmake_minimum_required (VERSION 2.6)
set(CMAKE_VERBOSE_MAKEFILE 1)
+include(CTest)
+
find_package(Java COMPONENTS Development)
include (UseJava)
@@ -14,3 +16,10 @@ add_jar(hello2 @${CMAKE_CURRENT_BINARY_DIR}/java_fileslist)
# use listing file to specify sources and specify output directory (issue
#17316)
add_jar(hello3 @${CMAKE_CURRENT_BINARY_DIR}/java_fileslist OUTPUT_DIR
"${CMAKE_CURRENT_BINARY_DIR}/hello3")
+
+add_test (NAME Java.Jar
+ COMMAND "${Java_JAVA_EXECUTABLE}" -classpath hello.jar HelloWorld)
+add_test (NAME Java.JarSourceList
+ COMMAND "${Java_JAVA_EXECUTABLE}" -classpath hello2.jar HelloWorld)
+add_test (NAME Java.JarSourceListAndOutput
+ COMMAND "${Java_JAVA_EXECUTABLE}" -classpath
"${CMAKE_CURRENT_BINARY_DIR}/hello3/hello3.jar" HelloWorld)
diff --git a/Tests/JavaJavah/CMakeLists.txt b/Tests/JavaJavah/CMakeLists.txt
index 071bf20..77c292a 100644
--- a/Tests/JavaJavah/CMakeLists.txt
+++ b/Tests/JavaJavah/CMakeLists.txt
@@ -3,6 +3,8 @@ project(helloJavah Java CXX)
cmake_minimum_required (VERSION 2.6)
set(CMAKE_VERBOSE_MAKEFILE 1)
+include(CTest)
+
find_package(Java COMPONENTS Development)
include (UseJava)
@@ -21,3 +23,6 @@ add_dependencies(B B_javah)
target_include_directories(B PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${JAVA_INCLUDE_PATH}
${JAVA_INCLUDE_PATH2})
+
+add_test (NAME Java.Javah
+ COMMAND "${Java_JAVA_EXECUTABLE}"
-Djava.library.path=$<TARGET_FILE_DIR:B> -classpath hello3.jar HelloWorld2)
diff --git a/Tests/JavaNativeHeaders/CMakeLists.txt
b/Tests/JavaNativeHeaders/CMakeLists.txt
index 7dc2679..2023d25 100644
--- a/Tests/JavaNativeHeaders/CMakeLists.txt
+++ b/Tests/JavaNativeHeaders/CMakeLists.txt
@@ -3,6 +3,8 @@ project(helloJavaNativeHeaders Java CXX)
cmake_minimum_required (VERSION 2.6)
set(CMAKE_VERBOSE_MAKEFILE 1)
+include (CTest)
+
find_package(Java COMPONENTS Development)
include (UseJava)
@@ -16,3 +18,7 @@ add_jar(hello4 HelloWorld3.java)
add_library(D SHARED D.cpp E.cpp)
target_link_libraries (D PRIVATE D1-native E1-native)
+
+
+add_test (NAME Java.NativeHeaders
+ COMMAND "${Java_JAVA_EXECUTABLE}"
-Djava.library.path=$<TARGET_FILE_DIR:D> -classpath hello4.jar HelloWorld3)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=333a2ff0990f73b1d8242d55777c497626afeaea
commit 333a2ff0990f73b1d8242d55777c497626afeaea
Merge: 7cccc5b ac99344
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Oct 2 08:21:53 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Oct 2 08:21:53 2019 -0400
Merge branch 'backport-xcode-scheme-custom-target'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cccc5b199b5b9e2ee488d1639f37a75ab4a89d6
commit 7cccc5b199b5b9e2ee488d1639f37a75ab4a89d6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Oct 2 08:15:05 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Oct 2 08:21:02 2019 -0400
Xcode: Restore CMAKE_XCODE_GENERATE_SCHEME for custom targets
The target property introduced by commit 413b71485a (Xcode: Create Xcode
schemes per target, 2019-03-11, v3.15.0-rc1~347^2) was accidentally not
initialized by `CMAKE_XCODE_GENERATE_SCHEME` for custom targets. Fix it
and update the test.
Fixes: #19759
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c565bde..99c16f2 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -364,7 +364,6 @@ cmTarget::cmTarget(std::string const& name,
cmStateEnums::TargetType type,
initPropValue("UNITY_BUILD_BATCH_SIZE", "8");
#ifdef __APPLE__
if (this->GetGlobalGenerator()->IsXcode()) {
- initProp("XCODE_GENERATE_SCHEME");
initProp("XCODE_SCHEME_ADDRESS_SANITIZER");
initProp("XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN");
initProp("XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING");
@@ -385,6 +384,12 @@ cmTarget::cmTarget(std::string const& name,
cmStateEnums::TargetType type,
#endif
}
+ if (this->GetType() != cmStateEnums::INTERFACE_LIBRARY) {
+ if (this->GetGlobalGenerator()->IsXcode()) {
+ initProp("XCODE_GENERATE_SCHEME");
+ }
+ }
+
// Setup per-configuration property default values.
if (this->GetType() != cmStateEnums::UTILITY) {
static const auto configProps = {
diff --git a/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake
b/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake
index 88077b3..7d83a70 100644
--- a/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeSchemaProperty-check.cmake
@@ -7,6 +7,13 @@ function(check_property property matcher)
endif()
endfunction()
+function(expect_schema target)
+ set(schema
"${RunCMake_TEST_BINARY_DIR}/XcodeSchemaProperty.xcodeproj/xcshareddata/xcschemes/${target}.xcscheme")
+ if(NOT EXISTS ${schema})
+ message(SEND_ERROR "Missing schema for target ${target}")
+ endif()
+endfunction()
+
function(expect_no_schema target)
set(schema
"${RunCMake_TEST_BINARY_DIR}/XcodeSchemaProperty.xcodeproj/xcshareddata/xcschemes/${target}.xcscheme")
if(EXISTS ${schema})
@@ -40,3 +47,6 @@ check_property("ENVIRONMENT" [=[key="BAR"]=])
check_property("ENVIRONMENT" [=[value="bar"]=])
expect_no_schema("NoSchema")
+
+expect_schema("CustomTarget")
+expect_schema("ALL_BUILD")
diff --git a/Tests/RunCMake/XcodeProject/XcodeSchemaProperty.cmake
b/Tests/RunCMake/XcodeProject/XcodeSchemaProperty.cmake
index 73ef5ca..be219f4 100644
--- a/Tests/RunCMake/XcodeProject/XcodeSchemaProperty.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeSchemaProperty.cmake
@@ -38,3 +38,5 @@ create_scheme_for_property(ENVIRONMENT "FOO=foo;BAR=bar")
add_executable(NoSchema main.cpp)
set_target_properties(NoSchema PROPERTIES XCODE_GENERATE_SCHEME OFF)
+
+add_custom_target(CustomTarget)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJNI.cmake | 2 +-
Modules/FindJava.cmake | 4 +-
Source/cmTarget.cxx | 7 ++-
Tests/CMakeLists.txt | 50 +++-------------------
Tests/Java/CMakeLists.txt | 9 ++++
Tests/JavaJavah/CMakeLists.txt | 5 +++
Tests/JavaNativeHeaders/CMakeLists.txt | 6 +++
.../XcodeProject/XcodeSchemaProperty-check.cmake | 10 +++++
.../XcodeProject/XcodeSchemaProperty.cmake | 2 +
9 files changed, 48 insertions(+), 47 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
