From ae174f0dead780869fa2339bfa3a52a6117b8728 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sun, 21 Aug 2022 06:01:17 +0400 Subject: Build: Move `CMAKE_USE_WMAKE` definition to `cmConfigure.cmake.h.in` --- Source/CMakeLists.txt | 8 ++++++-- Source/cmConfigure.cmake.h.in | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index c182f2e..1901f68 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -31,6 +31,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX") set(CMake_USE_XCOFF_PARSER 1) endif() +# Watcom support +if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(CMAKE_USE_WMAKE 1) +endif() + set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR}) if(WIN32) @@ -861,8 +866,7 @@ if(WIN32) endif() # Watcom support -if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set_property(SOURCE cmake.cxx APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_USE_WMAKE) +if(CMAKE_USE_WMAKE) target_sources( CMakeLib PUBLIC diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 31d03da..ea7569f 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -22,6 +22,7 @@ #cmakedefine HAVE_UNSETENV #cmakedefine CMake_USE_MACH_PARSER #cmakedefine CMake_USE_XCOFF_PARSER +#cmakedefine CMAKE_USE_WMAKE #define CMake_DEFAULT_RECURSION_LIMIT @CMake_DEFAULT_RECURSION_LIMIT@ #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" #define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@" -- cgit v0.12