From 43c3243c2d344ae0bd62307893f49019fd335b71 Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Fri, 1 May 2020 16:12:02 +0200 Subject: OpenWatcom: Fix Linux support file Fix CMAKE_SHARED_LINKER_FLAGS_INIT macro Fix executable file name for Linux to be without extension Add system header files directory for cross-compilation --- Modules/Platform/Linux-OpenWatcom.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Modules/Platform/Linux-OpenWatcom.cmake b/Modules/Platform/Linux-OpenWatcom.cmake index df23366..5b4e995 100644 --- a/Modules/Platform/Linux-OpenWatcom.cmake +++ b/Modules/Platform/Linux-OpenWatcom.cmake @@ -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() -- cgit v0.12