diff options
author | Brad King <brad.king@kitware.com> | 2016-07-06 13:53:18 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-07-06 14:10:10 (GMT) |
commit | cdde77e5f66cee933a7b7c538c22e8c323a91d09 (patch) | |
tree | ee0e12f1bff4b7c5bce1b262bfba2f3d309f98b5 | |
parent | f9dbe22ca273501cf6d50585211c9d18a0e15f97 (diff) | |
download | CMake-cdde77e5f66cee933a7b7c538c22e8c323a91d09.zip CMake-cdde77e5f66cee933a7b7c538c22e8c323a91d09.tar.gz CMake-cdde77e5f66cee933a7b7c538c22e8c323a91d09.tar.bz2 |
OpenWatcom: Partially modernize platform information modules
Migrate from the old `<os>-<cc>.cmake` layout to the modern
`<os>-<id>-<lang>.cmake` layout. Keep settings common to C and C++ in a
`Windows-OpenWatcom.cmake` helper module with an include blocker.
For now just add both C and CXX settings in the helper module.
-rw-r--r-- | Modules/Platform/Windows-OpenWatcom-C.cmake | 1 | ||||
-rw-r--r-- | Modules/Platform/Windows-OpenWatcom-CXX.cmake | 1 | ||||
-rw-r--r-- | Modules/Platform/Windows-OpenWatcom.cmake (renamed from Modules/Platform/Windows-wcl386.cmake) | 20 | ||||
-rw-r--r-- | Modules/Platform/Windows-Watcom-C.cmake | 1 | ||||
-rw-r--r-- | Modules/Platform/Windows-Watcom-CXX.cmake | 1 |
5 files changed, 24 insertions, 0 deletions
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 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) |