From 3f78ced7c2318b23610c6a4ffdf727bde0efa529 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 17 Feb 2012 14:14:16 -0500 Subject: [PATCH] Rename Modules/Platform/Windows-{Borland => Embarcadero}.cmake The Borland compiler is now the Embarcadero compiler. Rename the shared platform information file to reflect this. This does not change the interface, as old versions are still "Borland", but will allow new versions released by Embarcadero to be supported cleanly. --- Modules/Platform/Windows-Borland-C.cmake | 4 ++-- Modules/Platform/Windows-Borland-CXX.cmake | 4 ++-- .../{Windows-Borland.cmake => Windows-Embarcadero.cmake} | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename Modules/Platform/{Windows-Borland.cmake => Windows-Embarcadero.cmake} (98%) diff --git a/Modules/Platform/Windows-Borland-C.cmake b/Modules/Platform/Windows-Borland-C.cmake index ebb74a11e..c8abb65a7 100644 --- a/Modules/Platform/Windows-Borland-C.cmake +++ b/Modules/Platform/Windows-Borland-C.cmake @@ -1,2 +1,2 @@ -include(Platform/Windows-Borland) -__borland_language(C) +include(Platform/Windows-Embarcadero) +__embarcadero_language(C) diff --git a/Modules/Platform/Windows-Borland-CXX.cmake b/Modules/Platform/Windows-Borland-CXX.cmake index 1260c0e90..9704f8aff 100644 --- a/Modules/Platform/Windows-Borland-CXX.cmake +++ b/Modules/Platform/Windows-Borland-CXX.cmake @@ -1,2 +1,2 @@ -include(Platform/Windows-Borland) -__borland_language(CXX) +include(Platform/Windows-Embarcadero) +__embarcadero_language(CXX) diff --git a/Modules/Platform/Windows-Borland.cmake b/Modules/Platform/Windows-Embarcadero.cmake similarity index 98% rename from Modules/Platform/Windows-Borland.cmake rename to Modules/Platform/Windows-Embarcadero.cmake index 5c402bd9f..a00f798a2 100644 --- a/Modules/Platform/Windows-Borland.cmake +++ b/Modules/Platform/Windows-Embarcadero.cmake @@ -13,10 +13,10 @@ # License text for the above reference.) # This module is shared by multiple languages; use include blocker. -if(__WINDOWS_BORLAND) +if(__WINDOWS_EMBARCADERO) return() endif() -set(__WINDOWS_BORLAND 1) +set(__WINDOWS_EMBARCADERO 1) SET(BORLAND 1) @@ -67,7 +67,7 @@ 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(__borland_language lang) +macro(__embarcadero_language lang) set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-tWD") # compile a source file into an object file