Recognize Embarcadero compiler (#12604)
The Borland compiler was re-branded as CodeGear during 2007-2009 and since 2009 is the Embarcadero compiler. They offer predefined macros: http://docwiki.embarcadero.com/RADStudio/en/Predefined_Macros and distinguish themselves by __CODEGEARC__ and __CODEGEARC_VERSION__. Version 6.30 (C++Builder XE) changed the meaning of some flags: http://docwiki.embarcadero.com/RADStudio/en/C%2B%2B_Compiler_Option_Changes_for_XE Teach Embarcadero compiler information files to generate build rules with flags matching the compiler version. Leave the flags unchanged for old Borland versions. Always set the BORLAND toolchain indicator for compatibility with existing projects that test it. Also set the EMBARCADERO indicator for newer toolchains.
This commit is contained in:
Brad King
parent
3f78ced7c2
commit
bdbbf763d6
|
|
@ -26,6 +26,12 @@
|
|||
# define COMPILER_VERSION_MINOR DEC(__clang_minor__)
|
||||
# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__)
|
||||
|
||||
#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__)
|
||||
# define COMPILER_ID "Embarcadero"
|
||||
# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF)
|
||||
# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF)
|
||||
# define COMPILER_VERSION_PATCH HEX(__CODEGEARC_VERSION__ & 0xFFFF)
|
||||
|
||||
#elif defined(__BORLANDC__)
|
||||
# define COMPILER_ID "Borland"
|
||||
/* __BORLANDC__ = 0xVRR */
|
||||
|
|
|
|||
|
|
@ -28,6 +28,12 @@
|
|||
# define COMPILER_VERSION_MINOR DEC(__clang_minor__)
|
||||
# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__)
|
||||
|
||||
#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__)
|
||||
# define COMPILER_ID "Embarcadero"
|
||||
# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF)
|
||||
# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF)
|
||||
# define COMPILER_VERSION_PATCH HEX(__CODEGEARC_VERSION__ & 0xFFFF)
|
||||
|
||||
#elif defined(__BORLANDC__)
|
||||
# define COMPILER_ID "Borland"
|
||||
/* __BORLANDC__ = 0xVRR */
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
include(Platform/Windows-Embarcadero)
|
||||
__embarcadero_language(C)
|
||||
include(Platform/Windows-Embarcadero-C)
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
include(Platform/Windows-Embarcadero)
|
||||
__embarcadero_language(CXX)
|
||||
include(Platform/Windows-Embarcadero-CXX)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
set(_lang C)
|
||||
include(Platform/Windows-Embarcadero)
|
||||
__embarcadero_language(C)
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
set(_lang CXX)
|
||||
include(Platform/Windows-Embarcadero)
|
||||
__embarcadero_language(CXX)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#=============================================================================
|
||||
# Copyright 2002-2009 Kitware, Inc.
|
||||
# Copyright 2002-2012 Kitware, Inc.
|
||||
#
|
||||
# Distributed under the OSI-approved BSD License (the "License");
|
||||
# see accompanying file Copyright.txt for details.
|
||||
|
|
@ -20,19 +20,26 @@ set(__WINDOWS_EMBARCADERO 1)
|
|||
|
||||
SET(BORLAND 1)
|
||||
|
||||
if("${CMAKE_${_lang}_COMPILER_VERSION}" VERSION_LESS 6.30)
|
||||
# Borland target type flags (bcc32 -h -t):
|
||||
# -tW GUI App (implies -U__CONSOLE__)
|
||||
# -tWC Console App (implies -D__CONSOLE__=1)
|
||||
# -tWD Build a DLL (implies -D__DLL__=1 -D_DLL=1)
|
||||
# -tWM Enable threads (implies -D__MT__=1 -D_MT=1)
|
||||
# -tWR Use DLL runtime (implies -D_RTLDLL, and '-tW' too!!)
|
||||
#
|
||||
set(_tW "-tW") # -tW GUI App (implies -U__CONSOLE__)
|
||||
set(_tC "-tWC") # -tWC Console App (implies -D__CONSOLE__=1)
|
||||
set(_tD "-tWD") # -tWD Build a DLL (implies -D__DLL__=1 -D_DLL=1)
|
||||
set(_tM "-tWM") # -tWM Enable threads (implies -D__MT__=1 -D_MT=1)
|
||||
set(_tR "-tWR -tW-") # -tWR Use DLL runtime (implies -D_RTLDLL, and '-tW' too!!)
|
||||
# Notes:
|
||||
# - The flags affect linking so we pass them to the linker.
|
||||
# - The flags affect preprocessing so we pass them to the compiler.
|
||||
# - Since '-tWR' implies '-tW' we use '-tWR -tW-' instead.
|
||||
# - Since '-tW-' disables '-tWD' we use '-tWR -tW- -tWD' for DLLs.
|
||||
set(_RTLDLL "-tWR -tW-")
|
||||
else()
|
||||
set(EMBARCADERO 1)
|
||||
set(_tC "-tC") # Target is a console application
|
||||
set(_tD "-tD") # Target is a shared library
|
||||
set(_tM "-tM") # Target is multi-threaded
|
||||
set(_tR "-tR") # Target uses the dynamic RTL
|
||||
set(_tW "-tW") # Target is a Windows application
|
||||
endif()
|
||||
set(_COMPILE_C "-c")
|
||||
set(_COMPILE_CXX "-P -c")
|
||||
|
||||
|
|
@ -50,14 +57,14 @@ SET(CMAKE_FIND_LIBRARY_SUFFIXES "-bcc.lib" ".lib")
|
|||
SET (CMAKE_MANGLE_OBJECT_FILE_NAMES "ON")
|
||||
|
||||
# extra flags for a win32 exe
|
||||
SET(CMAKE_CREATE_WIN32_EXE "-tW" )
|
||||
SET(CMAKE_CREATE_WIN32_EXE "${_tW}" )
|
||||
# extra flags for a console app
|
||||
SET(CMAKE_CREATE_CONSOLE_EXE "-tWC" )
|
||||
SET(CMAKE_CREATE_CONSOLE_EXE "${_tC}" )
|
||||
|
||||
SET (CMAKE_BUILD_TYPE Debug CACHE STRING
|
||||
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel.")
|
||||
|
||||
SET (CMAKE_EXE_LINKER_FLAGS_INIT "-tWM -lS:10000000 -lSc:10000000 ")
|
||||
SET (CMAKE_EXE_LINKER_FLAGS_INIT "${_tM} -lS:10000000 -lSc:10000000 ")
|
||||
SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "-v")
|
||||
SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "-v")
|
||||
SET (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
|
||||
|
|
@ -67,18 +74,19 @@ SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT})
|
|||
SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT})
|
||||
SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT})
|
||||
|
||||
|
||||
macro(__embarcadero_language lang)
|
||||
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-tWD")
|
||||
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "${_tD}")
|
||||
|
||||
# compile a source file into an object file
|
||||
# place <DEFINES> outside the response file because Borland refuses
|
||||
# to parse quotes from the response file.
|
||||
set(CMAKE_${lang}_COMPILE_OBJECT
|
||||
"<CMAKE_${lang}_COMPILER> ${_RTLDLL} <DEFINES> ${CMAKE_START_TEMP_FILE}-DWIN32 -o<OBJECT> <FLAGS> ${_COMPILE_${lang}} <SOURCE>${CMAKE_END_TEMP_FILE}"
|
||||
"<CMAKE_${lang}_COMPILER> ${_tR} <DEFINES> ${CMAKE_START_TEMP_FILE}-DWIN32 -o<OBJECT> <FLAGS> ${_COMPILE_${lang}} <SOURCE>${CMAKE_END_TEMP_FILE}"
|
||||
)
|
||||
|
||||
set(CMAKE_${lang}_LINK_EXECUTABLE
|
||||
"<CMAKE_${lang}_COMPILER> ${_RTLDLL} -e<TARGET> ${CMAKE_START_TEMP_FILE}<LINK_FLAGS> <FLAGS> <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
|
||||
"<CMAKE_${lang}_COMPILER> ${_tR} -e<TARGET> ${CMAKE_START_TEMP_FILE}<LINK_FLAGS> <FLAGS> <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
|
||||
# "implib -c -w <TARGET_IMPLIB> <TARGET>"
|
||||
)
|
||||
|
||||
|
|
@ -91,7 +99,7 @@ macro(__embarcadero_language lang)
|
|||
|
||||
# Create a module library.
|
||||
set(CMAKE_${lang}_CREATE_SHARED_MODULE
|
||||
"<CMAKE_${lang}_COMPILER> ${_RTLDLL} -tWD ${CMAKE_START_TEMP_FILE}-e<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
|
||||
"<CMAKE_${lang}_COMPILER> ${_tR} ${_tD} ${CMAKE_START_TEMP_FILE}-e<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
|
||||
)
|
||||
|
||||
# Create an import library for another target.
|
||||
|
|
@ -112,7 +120,7 @@ macro(__embarcadero_language lang)
|
|||
)
|
||||
|
||||
# Initial configuration flags.
|
||||
set(CMAKE_${lang}_FLAGS_INIT "-tWM")
|
||||
set(CMAKE_${lang}_FLAGS_INIT "${_tM}")
|
||||
set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-Od -v")
|
||||
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-O1 -DNDEBUG")
|
||||
set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
|
||||
|
|
|
|||
Loading…
Reference in New Issue