[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-727-ga773216
Brad King
brad.king at kitware.com
Wed Jul 6 10:24:50 EDT 2016
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 a7732165b12033c54d93d3a98b5e473ce4f2711c (commit)
via 4785596ab3978721be92df4ca9ac04d66ba69e7f (commit)
via 2a9e24aedfa5bc67a4166d0f26ad539c67e62c14 (commit)
from 79384df8ec5f234d3a08da089393f12a6518218b (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=a7732165b12033c54d93d3a98b5e473ce4f2711c
commit a7732165b12033c54d93d3a98b5e473ce4f2711c
Merge: 79384df 4785596
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 6 10:24:49 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 6 10:24:49 2016 -0400
Merge topic 'toolchain-flag-init' into next
4785596a fixup! Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain files
2a9e24ae OpenWatcom: Refactor platform information modules
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4785596ab3978721be92df4ca9ac04d66ba69e7f
commit 4785596ab3978721be92df4ca9ac04d66ba69e7f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 6 10:09:41 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 6 10:09:41 2016 -0400
fixup! Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain files
diff --git a/Modules/Platform/Windows-OpenWatcom.cmake b/Modules/Platform/Windows-OpenWatcom.cmake
index 7147600..269f923 100644
--- a/Modules/Platform/Windows-OpenWatcom.cmake
+++ b/Modules/Platform/Windows-OpenWatcom.cmake
@@ -52,13 +52,13 @@ set(CMAKE_BUILD_TYPE_INIT Debug)
# single/multi-threaded /-bm
# static/DLL run-time libraries /-br
# default is setup for multi-threaded + DLL run-time libraries
-set (CMAKE_C_FLAGS_INIT "-bt=nt -w3 -dWIN32 -br -bm")
-set (CMAKE_CXX_FLAGS_INIT "-bt=nt -xs -w3 -dWIN32 -br -bm")
+string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -w3 -dWIN32 -br -bm")
+string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -w3 -dWIN32 -br -bm")
foreach(lang C CXX)
- set (CMAKE_${lang}_FLAGS_DEBUG_INIT "-d2")
- set (CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-s -os -d0 -dNDEBUG")
- set (CMAKE_${lang}_FLAGS_RELEASE_INIT "-s -ot -d0 -dNDEBUG")
- set (CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-s -ot -d1 -dNDEBUG")
+ string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -d2")
+ string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -s -os -d0 -dNDEBUG")
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -s -ot -d0 -dNDEBUG")
+ string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -s -ot -d1 -dNDEBUG")
endforeach()
foreach(type CREATE_SHARED_LIBRARY CREATE_SHARED_MODULE LINK_EXECUTABLE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9e24aedfa5bc67a4166d0f26ad539c67e62c14
commit 2a9e24aedfa5bc67a4166d0f26ad539c67e62c14
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 6 09:53:18 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 6 09:53:18 2016 -0400
OpenWatcom: Refactor platform information modules
diff --git a/Modules/Platform/Windows-OpenWatcom-C.cmake b/Modules/Platform/Windows-OpenWatcom-C.cmake
new file mode 100644
index 0000000..ce9bc45
--- /dev/null
+++ b/Modules/Platform/Windows-OpenWatcom-C.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-OpenWatcom)
diff --git a/Modules/Platform/Windows-OpenWatcom-CXX.cmake b/Modules/Platform/Windows-OpenWatcom-CXX.cmake
new file mode 100644
index 0000000..ce9bc45
--- /dev/null
+++ b/Modules/Platform/Windows-OpenWatcom-CXX.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-OpenWatcom)
diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-OpenWatcom.cmake
similarity index 85%
rename from Modules/Platform/Windows-wcl386.cmake
rename to Modules/Platform/Windows-OpenWatcom.cmake
index 3bc5444..7147600 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-OpenWatcom.cmake
@@ -1,3 +1,23 @@
+
+#=============================================================================
+# Copyright 2002-2016 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+# This module is shared by multiple languages; use include blocker.
+if(__WINDOWS_OPENWATCOM)
+ return()
+endif()
+set(__WINDOWS_OPENWATCOM 1)
+
set(CMAKE_LIBRARY_PATH_FLAG "libpath ")
set(CMAKE_LINK_LIBRARY_FLAG "library ")
set(CMAKE_LINK_LIBRARY_FILE_FLAG "library")
diff --git a/Modules/Platform/Windows-Watcom-C.cmake b/Modules/Platform/Windows-Watcom-C.cmake
new file mode 100644
index 0000000..44a008b
--- /dev/null
+++ b/Modules/Platform/Windows-Watcom-C.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-OpenWatcom-C)
diff --git a/Modules/Platform/Windows-Watcom-CXX.cmake b/Modules/Platform/Windows-Watcom-CXX.cmake
new file mode 100644
index 0000000..63d109b
--- /dev/null
+++ b/Modules/Platform/Windows-Watcom-CXX.cmake
@@ -0,0 +1 @@
+include(Platform/Windows-OpenWatcom-CXX)
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Windows-OpenWatcom-C.cmake | 1 +
Modules/Platform/Windows-OpenWatcom-CXX.cmake | 1 +
...ndows-wcl386.cmake => Windows-OpenWatcom.cmake} | 32 ++++++++++++++++----
Modules/Platform/Windows-Watcom-C.cmake | 1 +
Modules/Platform/Windows-Watcom-CXX.cmake | 1 +
5 files changed, 30 insertions(+), 6 deletions(-)
create mode 100644 Modules/Platform/Windows-OpenWatcom-C.cmake
create mode 100644 Modules/Platform/Windows-OpenWatcom-CXX.cmake
rename Modules/Platform/{Windows-wcl386.cmake => Windows-OpenWatcom.cmake} (78%)
create mode 100644 Modules/Platform/Windows-Watcom-C.cmake
create mode 100644 Modules/Platform/Windows-Watcom-CXX.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list