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 a6a698aafb8fea7191669d9e9ca2bce0fb3be73f (commit)
via bf7f5d0a22c735cd1ebb3e40b8e9c0f6140c6d6a (commit)
via 59a30f2acfdf4bd9d9bd4fffbb9945a372957499 (commit)
via 194adaf985e86e4cdcc61dc8abd9be4d1a3498b9 (commit)
via 08cd7f6a02fcfb711f776a8083e53040b48aec8a (commit)
from 5f2f16319ab5832da4b3c7b0c1a5a4587a3991eb (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=a6a698aafb8fea7191669d9e9ca2bce0fb3be73f
commit a6a698aafb8fea7191669d9e9ca2bce0fb3be73f
Merge: bf7f5d0 59a30f2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jul 8 15:28:18 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jul 8 11:28:27 2019 -0400
Merge topic 'pb-cxx11'
59a30f2acf FindProtobuf: libprotoc also needs C++11
194adaf985 Tests: require C++11 for some protobuf tests
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3503
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf7f5d0a22c735cd1ebb3e40b8e9c0f6140c6d6a
commit bf7f5d0a22c735cd1ebb3e40b8e9c0f6140c6d6a
Merge: 5f2f163 08cd7f6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jul 8 15:26:20 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jul 8 11:26:29 2019 -0400
Merge topic 'threads-are-good'
08cd7f6a02 Swift: support multithreaded compilation
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3506
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59a30f2acfdf4bd9d9bd4fffbb9945a372957499
commit 59a30f2acfdf4bd9d9bd4fffbb9945a372957499
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Tue Jul 2 14:40:20 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Jul 3 18:49:49 2019 +0200
FindProtobuf: libprotoc also needs C++11
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 085e96c..670352c 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -582,6 +582,11 @@ if(Protobuf_INCLUDE_DIR)
set_target_properties(protobuf::libprotoc PROPERTIES
IMPORTED_LOCATION_DEBUG "${Protobuf_PROTOC_LIBRARY_DEBUG}")
endif()
+ if (Protobuf_VERSION VERSION_GREATER_EQUAL "3.6")
+ set_property(TARGET protobuf::libprotoc APPEND PROPERTY
+ INTERFACE_COMPILE_FEATURES cxx_std_11
+ )
+ endif()
if(UNIX AND TARGET Threads::Threads)
set_property(TARGET protobuf::libprotoc APPEND PROPERTY
INTERFACE_LINK_LIBRARIES Threads::Threads)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=194adaf985e86e4cdcc61dc8abd9be4d1a3498b9
commit 194adaf985e86e4cdcc61dc8abd9be4d1a3498b9
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Jul 1 17:03:00 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Jul 3 18:49:49 2019 +0200
Tests: require C++11 for some protobuf tests
Newer versions of Protobuf require C++11, which is reflected in the imported
target created by FindProtobuf. Manually set this for all tests that only
use
the variables.
diff --git a/Tests/FindProtobuf/Test/CMakeLists.txt
b/Tests/FindProtobuf/Test/CMakeLists.txt
index bc89190..fc6b37e 100644
--- a/Tests/FindProtobuf/Test/CMakeLists.txt
+++ b/Tests/FindProtobuf/Test/CMakeLists.txt
@@ -29,6 +29,7 @@ add_test(NAME test_tgt_protoc COMMAND test_tgt_protoc)
add_executable(test_var_protoc main-protoc.cxx)
target_include_directories(test_var_protoc PRIVATE ${Protobuf_INCLUDE_DIRS})
target_link_libraries(test_var_protoc PRIVATE ${Protobuf_PROTOC_LIBRARIES})
+target_compile_features(test_var_protoc PRIVATE cxx_std_11)
add_test(NAME test_var_protoc COMMAND test_var_protoc)
add_test(NAME test_tgt_protoc_version COMMAND protobuf::protoc --version)
@@ -37,14 +38,17 @@ set(Protobuf_IMPORT_DIRS ${Protobuf_INCLUDE_DIRS})
PROTOBUF_GENERATE_CPP(PROTO_SRC PROTO_HEADER msgs/example.proto)
PROTOBUF_GENERATE_CPP(DESC_PROTO_SRC DESC_PROTO_HEADER DESCRIPTORS
DESC_PROTO_DESC msgs/example_desc.proto)
add_library(msgs ${PROTO_SRC} ${PROTO_HEADER})
+target_compile_features(msgs PRIVATE cxx_std_11)
add_executable(test_generate main-generate.cxx ${PROTO_SRC})
target_include_directories(test_generate PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(test_generate msgs ${Protobuf_LIBRARIES})
+target_compile_features(test_generate PRIVATE cxx_std_11)
add_test(NAME test_generate COMMAND test_generate)
add_executable(test_desc main-desc.cxx ${DESC_PROTO_SRC})
target_compile_features(test_desc PRIVATE cxx_std_11)
target_include_directories(test_desc PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(test_desc msgs ${Protobuf_LIBRARIES})
+target_compile_features(test_desc PRIVATE cxx_std_11)
add_test(NAME test_desc COMMAND test_desc ${DESC_PROTO_DESC})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08cd7f6a02fcfb711f776a8083e53040b48aec8a
commit 08cd7f6a02fcfb711f776a8083e53040b48aec8a
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sun Jun 30 20:50:08 2019 -0700
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Tue Jul 2 10:45:07 2019 -0700
Swift: support multithreaded compilation
Query the number of logical CPUs available to enable parallel
compilation for Swift.
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index cc6a7d2..d4dbcca 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -98,6 +98,7 @@ Variables that Provide Information
/variable/CMAKE_STATIC_LIBRARY_PREFIX
/variable/CMAKE_STATIC_LIBRARY_SUFFIX
/variable/CMAKE_Swift_MODULE_DIRECTORY
+ /variable/CMAKE_Swift_NUM_THREADS
/variable/CMAKE_TOOLCHAIN_FILE
/variable/CMAKE_TWEAK_VERSION
/variable/CMAKE_VERBOSE_MAKEFILE
diff --git a/Help/variable/CMAKE_Swift_NUM_THREADS.rst
b/Help/variable/CMAKE_Swift_NUM_THREADS.rst
new file mode 100644
index 0000000..cb33678
--- /dev/null
+++ b/Help/variable/CMAKE_Swift_NUM_THREADS.rst
@@ -0,0 +1,8 @@
+CMAKE_Swift_NUM_THREADS
+-----------------------
+
+Number of threads for parallel compilation for Swift targets.
+
+This variable controls the number of parallel jobs that the swift driver
creates
+for building targets. If not specified, it will default to the number of
+logical CPUs on the host.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index f62f61b..0f84cce 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -49,11 +49,15 @@ if(NOT CMAKE_Swift_COMPILE_OBJECT)
set(CMAKE_Swift_COMPILE_OBJECT ":")
endif()
+if(NOT CMAKE_Swift_NUM_THREADS MATCHES "^[0-9]+$")
+ cmake_host_system_information(RESULT CMAKE_Swift_NUM_THREADS QUERY
NUMBER_OF_LOGICAL_CORES)
+endif()
+
if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY)
if(CMAKE_Swift_COMPILER_TARGET)
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -emit-library -o <TARGET> -module-name <SWIFT_MODULE_NAME>
-module-link-name <SWIFT_LIBRARY_NAME> -emit-module -emit-module-path
<SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES>
<LINK_FLAGS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET>
-module-name <SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME>
-emit-module -emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES>
<FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
else()
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -emit-library -o <TARGET>
-module-name <SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME>
-emit-module -emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES>
<FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_SHARED_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET> -module-name
<SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
endif()
endif()
@@ -63,17 +67,17 @@ endif()
if(NOT CMAKE_Swift_LINK_EXECUTABLE)
if(CMAKE_Swift_COMPILER_TARGET)
- set(CMAKE_Swift_LINK_EXECUTABLE "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -emit-executable -o <TARGET> -emit-module -emit-module-path
<SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES>
<LINK_FLAGS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_LINK_EXECUTABLE "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-executable -o
<TARGET> -emit-module -emit-module-path <SWIFT_MODULE> -emit-dependencies
<DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
else()
- set(CMAKE_Swift_LINK_EXECUTABLE "${CMAKE_Swift_COMPILER} -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -emit-executable -o <TARGET> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_LINK_EXECUTABLE "${CMAKE_Swift_COMPILER} -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads ${CMAKE_Swift_NUM_THREADS}
-emit-executable -o <TARGET> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
<LINK_LIBRARIES>")
endif()
endif()
if(NOT CMAKE_Swift_CREATE_STATIC_LIBRARY)
if(CMAKE_Swift_COMPILER_TARGET)
- set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -emit-library -static -o <TARGET> -module-name <SWIFT_MODULE_NAME>
-module-link-name <SWIFT_LIBRARY_NAME> -emit-module -emit-module-path
<SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES>
<LINK_FLAGS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER} -target
<CMAKE_Swift_COMPILER_TARGET> -output-file-map <SWIFT_OUTPUT_FILE_MAP>
-incremental -num-threads ${CMAKE_Swift_NUM_THREADS} -emit-library -static -o
<TARGET> -module-name <SWIFT_MODULE_NAME> -module-link-name
<SWIFT_LIBRARY_NAME> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
<LINK_LIBRARIES>")
else()
- set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -emit-library -static -o
<TARGET> -module-name <SWIFT_MODULE_NAME> -module-link-name
<SWIFT_LIBRARY_NAME> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
<LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_COMPILER}
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -static -o <TARGET> -module-name
<SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
endif()
set(CMAKE_Swift_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <OBJECTS>")
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 1 +
Help/variable/CMAKE_Swift_NUM_THREADS.rst | 8 ++++++++
Modules/CMakeSwiftInformation.cmake | 16 ++++++++++------
Modules/FindProtobuf.cmake | 5 +++++
Tests/FindProtobuf/Test/CMakeLists.txt | 4 ++++
5 files changed, 28 insertions(+), 6 deletions(-)
create mode 100644 Help/variable/CMAKE_Swift_NUM_THREADS.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
