mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-04 21:00:17 -06:00
Merge topic 'ow-mult-platforms'
4adfd2a3aaOpenWatcom: Add cross-compilation support for Windows43c3243c2dOpenWatcom: Fix Linux support filed26eea220aOpenWatcom: Add OS/2 target support0ab583d787OpenWatcom: Add DOS target support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4702
This commit is contained in:
1
Modules/Platform/DOS-OpenWatcom-C.cmake
Normal file
1
Modules/Platform/DOS-OpenWatcom-C.cmake
Normal file
@@ -0,0 +1 @@
|
||||
include(Platform/DOS-OpenWatcom)
|
||||
1
Modules/Platform/DOS-OpenWatcom-CXX.cmake
Normal file
1
Modules/Platform/DOS-OpenWatcom-CXX.cmake
Normal file
@@ -0,0 +1 @@
|
||||
include(Platform/DOS-OpenWatcom)
|
||||
28
Modules/Platform/DOS-OpenWatcom.cmake
Normal file
28
Modules/Platform/DOS-OpenWatcom.cmake
Normal file
@@ -0,0 +1,28 @@
|
||||
|
||||
# This module is shared by multiple languages; use include blocker.
|
||||
include_guard()
|
||||
|
||||
set(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
|
||||
if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system dos")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system dos")
|
||||
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system dos")
|
||||
else()
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system dos4g")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system dos4g")
|
||||
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system dos4g")
|
||||
endif()
|
||||
|
||||
set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';' separated list
|
||||
set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated string.
|
||||
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " -bt=dos")
|
||||
string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=dos -xs")
|
||||
|
||||
if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES)
|
||||
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h)
|
||||
endif()
|
||||
if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
|
||||
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h)
|
||||
endif()
|
||||
14
Modules/Platform/DOS.cmake
Normal file
14
Modules/Platform/DOS.cmake
Normal file
@@ -0,0 +1,14 @@
|
||||
set(DOS 1)
|
||||
|
||||
set(CMAKE_STATIC_LIBRARY_PREFIX "")
|
||||
set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
|
||||
set(CMAKE_SHARED_LIBRARY_PREFIX "")
|
||||
set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")
|
||||
set(CMAKE_IMPORT_LIBRARY_PREFIX "")
|
||||
set(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib")
|
||||
set(CMAKE_EXECUTABLE_SUFFIX ".exe")
|
||||
set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
|
||||
set(CMAKE_DL_LIBS "")
|
||||
|
||||
set(CMAKE_FIND_LIBRARY_PREFIXES "")
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
|
||||
@@ -4,13 +4,22 @@
|
||||
# This module is shared by multiple languages; use include blocker.
|
||||
include_guard()
|
||||
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux")
|
||||
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system linux")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux")
|
||||
|
||||
set(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux opt noextension")
|
||||
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system linux")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system linux")
|
||||
|
||||
# single/multi-threaded /-bm
|
||||
# default is setup for single-threaded libraries
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " -bt=linux")
|
||||
string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=linux -xs")
|
||||
|
||||
if(CMAKE_CROSSCOMPILING)
|
||||
if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES)
|
||||
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/lh)
|
||||
endif()
|
||||
if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
|
||||
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/lh)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
1
Modules/Platform/OS2-OpenWatcom-C.cmake
Normal file
1
Modules/Platform/OS2-OpenWatcom-C.cmake
Normal file
@@ -0,0 +1 @@
|
||||
include(Platform/OS2-OpenWatcom)
|
||||
1
Modules/Platform/OS2-OpenWatcom-CXX.cmake
Normal file
1
Modules/Platform/OS2-OpenWatcom-CXX.cmake
Normal file
@@ -0,0 +1 @@
|
||||
include(Platform/OS2-OpenWatcom)
|
||||
35
Modules/Platform/OS2-OpenWatcom.cmake
Normal file
35
Modules/Platform/OS2-OpenWatcom.cmake
Normal file
@@ -0,0 +1,35 @@
|
||||
# This module is shared by multiple languages; use include blocker.
|
||||
include_guard()
|
||||
|
||||
set(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
|
||||
if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system os2")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system os2_dll")
|
||||
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system os2_dll")
|
||||
else()
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system os2v2")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system os2v2_dll")
|
||||
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system os2v2_dll")
|
||||
endif()
|
||||
|
||||
set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';' separated list
|
||||
set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated string.
|
||||
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " -bt=os2")
|
||||
string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=os2 -xs")
|
||||
|
||||
if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES)
|
||||
if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86")
|
||||
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os21x)
|
||||
else()
|
||||
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os2)
|
||||
endif()
|
||||
endif()
|
||||
if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
|
||||
if(DEFINED CMAKE_SYSTEM_PROCESSOR AND CMAKE_SYSTEM_PROCESSOR STREQUAL "I86")
|
||||
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os21x)
|
||||
else()
|
||||
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os2)
|
||||
endif()
|
||||
endif()
|
||||
14
Modules/Platform/OS2.cmake
Normal file
14
Modules/Platform/OS2.cmake
Normal file
@@ -0,0 +1,14 @@
|
||||
set(OS2 1)
|
||||
|
||||
set(CMAKE_STATIC_LIBRARY_PREFIX "")
|
||||
set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
|
||||
set(CMAKE_SHARED_LIBRARY_PREFIX "")
|
||||
set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")
|
||||
set(CMAKE_IMPORT_LIBRARY_PREFIX "")
|
||||
set(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib")
|
||||
set(CMAKE_EXECUTABLE_SUFFIX ".exe")
|
||||
set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
|
||||
set(CMAKE_DL_LIBS "")
|
||||
|
||||
set(CMAKE_FIND_LIBRARY_PREFIXES "")
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
|
||||
@@ -4,6 +4,8 @@
|
||||
# This module is shared by multiple languages; use include blocker.
|
||||
include_guard()
|
||||
|
||||
set(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
|
||||
set(CMAKE_CREATE_WIN32_EXE "system nt_win" )
|
||||
set(CMAKE_CREATE_CONSOLE_EXE "system nt" )
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system nt_dll")
|
||||
@@ -14,10 +16,17 @@ set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated st
|
||||
|
||||
set(CMAKE_RC_COMPILER "rc" )
|
||||
|
||||
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
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -dWIN32 -br -bm")
|
||||
string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -dWIN32 -br -bm")
|
||||
|
||||
if(CMAKE_CROSSCOMPILING)
|
||||
if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES)
|
||||
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/nt)
|
||||
endif()
|
||||
if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
|
||||
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/nt)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user