[Cmake-commits] CMake branch, next, updated. v3.4.1-1585-g26d765c
James Johnston
johnstonj.public at codenest.com
Thu Dec 3 16:39:50 EST 2015
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, next has been updated
via 26d765cf6b6c6a08b03b8643cd7b408dc29a373b (commit)
via 7a3277276e69c92d0f69674cdc27bae11bcbc14f (commit)
via 25211d756fad353e96d29e289d40d780a5341c92 (commit)
via 060442c2e866c44ecf0c479e49e1d5ae35e8c6fb (commit)
via f3b3219c9687e54a83dc7e5dabb0afc4637bb799 (commit)
via ddbda72288f022fa558d8253c8894687634448c1 (commit)
via 4ffeab0e3c451854a4a9d424b47b2179c6cf6c6b (commit)
from 23b5ca6d7461f3c166a0ab826c456bc30a370452 (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=26d765cf6b6c6a08b03b8643cd7b408dc29a373b
commit 26d765cf6b6c6a08b03b8643cd7b408dc29a373b
Merge: 23b5ca6 7a32772
Author: James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 3 16:39:47 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 3 16:39:47 2015 -0500
Merge topic 'improve-embarcadero' into next
7a327727 Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__.
25211d75 Compiler ID: Compiler versions must be a valid, numeric version string.
060442c2 Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID.
f3b3219c Embarcadero/Watcom: Properly skip VSResource test for other generators.
ddbda722 Embarcadero: Fix bug where duplicate Ninja job pools would be created.
4ffeab0e CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a3277276e69c92d0f69674cdc27bae11bcbc14f
commit 7a3277276e69c92d0f69674cdc27bae11bcbc14f
Author: James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 3 21:24:56 2015 +0000
Commit: James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Dec 3 21:37:08 2015 +0000
Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__.
As per the following link:
http://docwiki.embarcadero.com/RADStudio/Seattle/en/Example_of_CODEGEARC_VERSION_Macro
The major/minor versions must be decoded as a hex string, while the patch
version must be decoded as a normal decimal string.
As an example, C++ Builder XE 8.1's bcc32.exe sets this macro to 0x070189C9.
The file version of bcc32.exe is 7.1.5570.35273. Therefore, the correct
interpretation to COMPILER_VERSION would be 7.1.35273.
diff --git a/Modules/Compiler/Embarcadero-DetermineCompiler.cmake b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
index 2feedac..8375624 100644
--- a/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
+++ b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
@@ -4,4 +4,4 @@ set(_compiler_id_pp_test "defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__
set(_compiler_id_version_compute "
# define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_HEX@(__CODEGEARC_VERSION__>>24 & 0x00FF)
# define @PREFIX at COMPILER_VERSION_MINOR @MACRO_HEX@(__CODEGEARC_VERSION__>>16 & 0x00FF)
-# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_HEX@(__CODEGEARC_VERSION__ & 0xFFFF)")
+# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_DEC@(__CODEGEARC_VERSION__ & 0xFFFF)")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25211d756fad353e96d29e289d40d780a5341c92
commit 25211d756fad353e96d29e289d40d780a5341c92
Author: James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 3 21:17:26 2015 +0000
Commit: James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Dec 3 21:37:07 2015 +0000
Compiler ID: Compiler versions must be a valid, numeric version string.
This test helps catch errors in compiler identification.
diff --git a/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt
index 848ffdd..6fea73e 100644
--- a/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt
+++ b/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt
@@ -12,3 +12,10 @@ foreach(v
message(SEND_ERROR "${v} not set!")
endif()
endforeach()
+
+# Version numbers may only contain numbers and periods.
+if(NOT CMAKE_C_COMPILER_VERSION MATCHES
+ "^([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?(\\.([0-9]+))?$"
+ )
+ message(SEND_ERROR "Compiler version is not numeric!")
+endif()
diff --git a/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt
index 94ac31e..05e6bb2 100644
--- a/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt
+++ b/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt
@@ -12,3 +12,10 @@ foreach(v
message(SEND_ERROR "${v} not set!")
endif()
endforeach()
+
+# Version numbers may only contain numbers and periods.
+if(NOT CMAKE_CXX_COMPILER_VERSION MATCHES
+ "^([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?(\\.([0-9]+))?$"
+ )
+ message(SEND_ERROR "Compiler version is not numeric!")
+endif()
diff --git a/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
index 02e4668..067fb8c 100644
--- a/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
+++ b/Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt
@@ -12,3 +12,10 @@ foreach(v
message(SEND_ERROR "${v} not set!")
endif()
endforeach()
+
+# Version numbers may only contain numbers and periods.
+if(NOT CMAKE_Fortran_COMPILER_VERSION MATCHES
+ "^([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?(\\.([0-9]+))?$"
+ )
+ message(SEND_ERROR "Compiler version is not numeric!")
+endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=060442c2e866c44ecf0c479e49e1d5ae35e8c6fb
commit 060442c2e866c44ecf0c479e49e1d5ae35e8c6fb
Author: James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 3 20:42:30 2015 +0000
Commit: James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Dec 3 21:37:06 2015 +0000
Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID.
The CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID variables are set to
"Borland" for older versions of the compiler. Newer CodeGear/Embarcadero
compilers will have those variables set to "Embarcadero". Search for lines of
code referencing both the variable name and Borland to be sure that they also
refer to Embarcadero.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 8205425..4f4efbc 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -230,7 +230,11 @@ macro(_test_compiler_hidden_visibility)
endmacro()
macro(_test_compiler_has_deprecated)
+ # NOTE: Some Embarcadero compilers silently compile __declspec(deprecated)
+ # without error, but this is not a documented feature and the attribute does
+ # not actually generate any warnings.
if(CMAKE_CXX_COMPILER_ID MATCHES Borland
+ OR CMAKE_CXX_COMPILER_ID MATCHES Embarcadero
OR CMAKE_CXX_COMPILER_ID MATCHES HP
OR GCC_TOO_OLD
OR CMAKE_CXX_COMPILER_ID MATCHES PGI
diff --git a/Tests/CompileOptions/CMakeLists.txt b/Tests/CompileOptions/CMakeLists.txt
index 05a5f82..692e0de 100644
--- a/Tests/CompileOptions/CMakeLists.txt
+++ b/Tests/CompileOptions/CMakeLists.txt
@@ -22,7 +22,7 @@ set_property(TARGET CompileOptions PROPERTY COMPILE_OPTIONS
${cxx_tests}
)
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Borland")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Borland|Embarcadero")
set_property(TARGET CompileOptions APPEND PROPERTY COMPILE_OPTIONS
"-DTEST_OCTOTHORPE=\"#\""
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3b3219c9687e54a83dc7e5dabb0afc4637bb799
commit f3b3219c9687e54a83dc7e5dabb0afc4637bb799
Author: James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 3 19:36:13 2015 +0000
Commit: James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Dec 3 21:37:06 2015 +0000
Embarcadero/Watcom: Properly skip VSResource test for other generators.
This test should be skipped based on the chosen compiler, not the chosen
generator.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5fd7159..06eb629 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -269,8 +269,7 @@ if(BUILD_TESTING)
set(TEST_RESOURCES TRUE)
endif()
# for borland and watcom there is no resource support
- if("${CMAKE_GENERATOR}" MATCHES "WMake" OR
- "${CMAKE_GENERATOR}" MATCHES "Borland")
+ if(WATCOM OR BORLAND)
set(TEST_RESOURCES FALSE)
endif()
if(TEST_RESOURCES)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddbda72288f022fa558d8253c8894687634448c1
commit ddbda72288f022fa558d8253c8894687634448c1
Author: James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 3 19:10:19 2015 +0000
Commit: James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Dec 3 19:10:19 2015 +0000
Embarcadero: Fix bug where duplicate Ninja job pools would be created.
If the platform file was included multiple times, it was possible that
duplicate Ninja job pools would be created.
diff --git a/Modules/Platform/Windows-Embarcadero.cmake b/Modules/Platform/Windows-Embarcadero.cmake
index 5295a48..102e3a6 100644
--- a/Modules/Platform/Windows-Embarcadero.cmake
+++ b/Modules/Platform/Windows-Embarcadero.cmake
@@ -78,7 +78,11 @@ set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_SHARED_LINKER_FLAGS_R
# invocations within a single working directory.
if(NOT DEFINED CMAKE_JOB_POOL_LINK)
set(CMAKE_JOB_POOL_LINK BCC32LinkPool)
- set_property(GLOBAL APPEND PROPERTY JOB_POOLS BCC32LinkPool=1)
+ get_property(_bccjp GLOBAL PROPERTY JOB_POOLS)
+ if(NOT _bccjp MATCHES "BCC32LinkPool=")
+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS BCC32LinkPool=1)
+ endif()
+ unset(_bccjp)
endif()
macro(__embarcadero_language lang)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Embarcadero-DetermineCompiler.cmake | 2 +-
Modules/GenerateExportHeader.cmake | 4 ++++
Modules/Platform/Windows-Embarcadero.cmake | 6 +++++-
Source/CMakeVersion.cmake | 2 +-
Tests/CMakeLists.txt | 3 +--
Tests/CMakeOnly/CompilerIdC/CMakeLists.txt | 7 +++++++
Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt | 7 +++++++
Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt | 7 +++++++
Tests/CompileOptions/CMakeLists.txt | 2 +-
9 files changed, 34 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list