Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
2db55ffa
Commit
2db55ffa
authored
Aug 06, 2014
by
Stephen Kelly
Browse files
Remove borland workarounds.
CMake 3.0 is the last release to require to be able to build with Borland.
parent
a7596fef
Changes
26
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
2db55ffa
...
...
@@ -115,7 +115,7 @@ endmacro()
if
(
NOT CMake_TEST_EXTERNAL_CMAKE
)
set
(
CMAKE_BUILD_ON_VISUAL_STUDIO 0
)
if
(
WIN32 AND NOT UNIX AND NOT
BORLAND AND NOT
MINGW
)
if
(
WIN32 AND NOT UNIX AND NOT MINGW
)
set
(
CMAKE_BUILD_ON_VISUAL_STUDIO 1
)
endif
()
endif
()
...
...
Source/CMakeLists.txt
View file @
2db55ffa
...
...
@@ -473,7 +473,7 @@ set(SRCS ${SRCS}
cmNinjaUtilityTargetGenerator.cxx
cmNinjaUtilityTargetGenerator.h
)
if
(
WIN32 AND NOT CYGWIN
AND NOT BORLAND
)
if
(
WIN32 AND NOT CYGWIN
)
set_source_files_properties
(
cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501
)
add_executable
(
cmcldeps cmcldeps.cxx
)
target_link_libraries
(
cmcldeps CMakeLib
)
...
...
Source/CPack/cmCPackGeneratorFactory.cxx
View file @
2db55ffa
...
...
@@ -47,9 +47,6 @@
#include
"cmCPackLog.h"
#if defined(__BORLANDC__)
# pragma warn -8008
/* condition is always true */
#endif
//----------------------------------------------------------------------
cmCPackGeneratorFactory
::
cmCPackGeneratorFactory
()
...
...
Source/CPack/cmCPackSTGZGenerator.cxx
View file @
2db55ffa
...
...
@@ -71,8 +71,6 @@ int cmCPackSTGZGenerator::PackageFiles()
retval
&=
cmSystemTools
::
SetPermissions
((
*
it
).
c_str
(),
#if defined( _MSC_VER ) || defined( __MINGW32__ )
S_IREAD
|
S_IWRITE
|
S_IEXEC
#elif defined( __BORLANDC__ )
S_IRUSR
|
S_IWUSR
|
S_IXUSR
#else
S_IRUSR
|
S_IWUSR
|
S_IXUSR
|
S_IRGRP
|
S_IWGRP
|
S_IXGRP
|
...
...
Source/CTest/cmCTestBuildHandler.cxx
View file @
2db55ffa
...
...
@@ -36,9 +36,6 @@
#include
<math.h>
#include
<float.h>
#if defined(__BORLANDC__)
# pragma warn -8060
/* possibly incorrect assignment */
#endif
static
const
char
*
cmCTestErrorMatches
[]
=
{
"^[Bb]us [Ee]rror"
,
...
...
Source/cmCommandArgumentParser.cxx
View file @
2db55ffa
...
...
@@ -183,12 +183,6 @@ static void cmCommandArgumentError(yyscan_t yyscanner, const char* message);
#define YYINITDEPTH 10000
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004
/* Variable assigned a value that is not used. */
# pragma warn -8008
/* condition always returns true */
# pragma warn -8060
/* possibly incorrect assignment */
# pragma warn -8066
/* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102)
/* Unused goto label. */
# pragma warning (disable: 4065)
/* Switch statement contains default but no
...
...
Source/cmCommandArgumentParser.y
View file @
2db55ffa
...
...
@@ -64,12 +64,6 @@ static void cmCommandArgumentError(yyscan_t yyscanner, const char* message);
#define YYINITDEPTH 10000
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004 /* Variable assigned a value that is not used. */
# pragma warn -8008 /* condition always returns true */
# pragma warn -8060 /* possibly incorrect assignment */
# pragma warn -8066 /* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102) /* Unused goto label. */
# pragma warning (disable: 4065) /* Switch statement contains default but no
...
...
Source/cmDependsFortranParser.cxx
View file @
2db55ffa
...
...
@@ -144,12 +144,6 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
}
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004
/* Variable assigned a value that is not used. */
# pragma warn -8008
/* condition always returns true */
# pragma warn -8060
/* possibly incorrect assignment */
# pragma warn -8066
/* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102)
/* Unused goto label. */
# pragma warning (disable: 4065)
/* Switch contains default but no case. */
...
...
Source/cmDependsFortranParser.y
View file @
2db55ffa
...
...
@@ -68,12 +68,6 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
}
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004 /* Variable assigned a value that is not used. */
# pragma warn -8008 /* condition always returns true */
# pragma warn -8060 /* possibly incorrect assignment */
# pragma warn -8066 /* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102) /* Unused goto label. */
# pragma warning (disable: 4065) /* Switch contains default but no case. */
...
...
Source/cmDependsJavaParser.cxx
View file @
2db55ffa
...
...
@@ -336,12 +336,6 @@ static void cmDependsJavaError(yyscan_t yyscanner, const char* message);
#define jpStoreClass(str) \
yyGetParser->AddClassFound(str); yyGetParser->DeallocateParserType(&(str))
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004
/* Variable assigned a value that is not used. */
# pragma warn -8008
/* condition always returns true */
# pragma warn -8060
/* possibly incorrect assignment */
# pragma warn -8066
/* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102)
/* Unused goto label. */
# pragma warning (disable: 4065)
/* Switch statement contains default but
...
...
Source/cmDependsJavaParser.y
View file @
2db55ffa
...
...
@@ -52,12 +52,6 @@ static void cmDependsJavaError(yyscan_t yyscanner, const char* message);
#define jpElementStart(cnt) yyGetParser->PrepareElement(&yyval)
#define jpStoreClass(str) yyGetParser->AddClassFound(str); yyGetParser->DeallocateParserType(&(str))
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004 /* Variable assigned a value that is not used. */
# pragma warn -8008 /* condition always returns true */
# pragma warn -8060 /* possibly incorrect assignment */
# pragma warn -8066 /* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102) /* Unused goto label. */
# pragma warning (disable: 4065) /* Switch statement contains default but no case. */
...
...
Source/cmExprParser.cxx
View file @
2db55ffa
...
...
@@ -157,12 +157,6 @@ static void cmExprError(yyscan_t yyscanner, const char* message);
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004
/* Variable assigned a value that is not used. */
# pragma warn -8008
/* condition always returns true */
# pragma warn -8060
/* possibly incorrect assignment */
# pragma warn -8066
/* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102)
/* Unused goto label. */
# pragma warning (disable: 4065)
/* Switch statement contains default but
...
...
Source/cmExprParser.y
View file @
2db55ffa
...
...
@@ -52,12 +52,6 @@ static void cmExprError(yyscan_t yyscanner, const char* message);
/* Disable some warnings in the generated code. */
#ifdef __BORLANDC__
# pragma warn -8004 /* Variable assigned a value that is not used. */
# pragma warn -8008 /* condition always returns true */
# pragma warn -8060 /* possibly incorrect assignment */
# pragma warn -8066 /* unreachable code */
#endif
#ifdef _MSC_VER
# pragma warning (disable: 4102) /* Unused goto label. */
# pragma warning (disable: 4065) /* Switch statement contains default but no case. */
...
...
Source/cmFileCommand.cxx
View file @
2db55ffa
...
...
@@ -220,8 +220,6 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args,
cmSystemTools
::
SetPermissions
(
fileName
.
c_str
(),
#if defined( _MSC_VER ) || defined( __MINGW32__ )
mode
|
S_IWRITE
#elif defined( __BORLANDC__ )
mode
|
S_IWUSR
#else
mode
|
S_IWUSR
|
S_IWGRP
#endif
...
...
Source/cmGeneratorExpression.cxx
View file @
2db55ffa
...
...
@@ -33,18 +33,10 @@ cmGeneratorExpression::cmGeneratorExpression(
cmsys
::
auto_ptr
<
cmCompiledGeneratorExpression
>
cmGeneratorExpression
::
Parse
(
std
::
string
const
&
input
)
{
#if !defined(__BORLANDC__)
return
cmsys
::
auto_ptr
<
cmCompiledGeneratorExpression
>
(
new
cmCompiledGeneratorExpression
(
this
->
Backtrace
?
*
this
->
Backtrace
:
cmListFileBacktrace
(
NULL
),
input
));
#else
cmListFileBacktrace
emptyBacktrace
(
NULL
);
return
cmsys
::
auto_ptr
<
cmCompiledGeneratorExpression
>
(
new
cmCompiledGeneratorExpression
(
this
->
Backtrace
?
*
this
->
Backtrace
:
emptyBacktrace
,
input
));
#endif
}
//----------------------------------------------------------------------------
...
...
Source/cmListFileCache.cxx
View file @
2db55ffa
...
...
@@ -19,9 +19,6 @@
#include
<cmsys/RegularExpression.hxx>
#ifdef __BORLANDC__
# pragma warn -8060
/* possibly incorrect assignment */
#endif
//----------------------------------------------------------------------------
struct
cmListFileParser
...
...
Source/cmStandardIncludes.h
View file @
2db55ffa
...
...
@@ -28,12 +28,6 @@
#define CMAKE_NO_ANSI_FOR_SCOPE
#endif
#ifdef __BORLANDC__
# pragma warn -8030
/* Temporary used for parameter */
# pragma warn -8027
/* 'for' not inlined. */
# pragma warn -8026
/* 'exception' not inlined. */
# pragma warn -8004
/* value never used */
#endif
#ifdef __ICL
#pragma warning ( disable : 985 )
...
...
@@ -78,10 +72,6 @@ public:
#if defined(_MSC_VER)
# pragma warning (push,1)
#endif
#if defined(__BORLANDC__)
# pragma warn -8008
/* condition is always false (RESET BELOW!) */
# pragma warn -8066
/* unreachable code (RESET BELOW!) */
#endif
#ifndef CMAKE_NO_ANSI_STREAM_HEADERS
# include <fstream>
...
...
@@ -112,10 +102,6 @@ public:
#include
<set>
#include
<deque>
#if defined(__BORLANDC__)
# pragma warn .8008
/* condition is always false (disabled above) */
# pragma warn .8066
/* unreachable code (disabled above) */
#endif
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
...
...
@@ -134,10 +120,6 @@ public:
// include blockers are put in place that prevent including the
// C-style versions from ever including the sub-headers. Therefore we
// have to include the sub-headers here to get the using declarations.
#if defined(__BORLANDC__)
# include <mem.h>
/* mem... functions from string.h */
# include <search.h>
/* search functions from stdlib.h */
#endif
#if !defined(_WIN32) && defined(__COMO__)
...
...
@@ -412,8 +394,7 @@ inline bool cmHasLiteralSuffixImpl(const char* str1,
}
#if defined(_MSC_VER) && _MSC_VER < 1300 \
|| defined(__GNUC__) && __GNUC__ < 3 \
|| defined(__BORLANDC__)
|| defined(__GNUC__) && __GNUC__ < 3
#define cmArrayBegin(a) a
#define cmArraySize(a) (sizeof(a)/sizeof(*a))
...
...
Source/cmStandardLexer.h
View file @
2db55ffa
...
...
@@ -25,25 +25,6 @@
# pragma warning ( disable : 4786 )
#endif
#if defined(__BORLANDC__)
# pragma warn -8008
/* condition always returns true */
# pragma warn -8066
/* unreachable code */
#endif
/* Borland system header defines these macros without first undef-ing them. */
#if defined(__BORLANDC__) && __BORLANDC__ >= 0x580
# undef INT8_MIN
# undef INT16_MIN
# undef INT32_MIN
# undef INT8_MAX
# undef INT16_MAX
# undef INT32_MAX
# undef UINT8_MAX
# undef UINT16_MAX
# undef UINT32_MAX
# include <stdint.h>
#endif
/* Make sure SGI termios does not define ECHO differently. */
#if defined(__sgi) && !defined(__GNUC__)
# include <sys/termios.h>
...
...
Source/cmSystemTools.cxx
View file @
2db55ffa
...
...
@@ -52,8 +52,7 @@
#include
<sys/stat.h>
#if defined(_WIN32) && \
(defined(_MSC_VER) || defined(__WATCOMC__) || \
defined(__BORLANDC__) || defined(__MINGW32__))
(defined(_MSC_VER) || defined(__WATCOMC__) || defined(__MINGW32__))
# include <io.h>
#endif
...
...
@@ -1649,9 +1648,6 @@ namespace{
fprintf
(
out
,
" -> %s"
,
archive_entry_symlink
(
entry
));
}
}
#ifdef __BORLANDC__
# pragma warn -8066
/* unreachable code */
#endif
long
copy_data
(
struct
archive
*
ar
,
struct
archive
*
aw
)
{
...
...
Source/cmWriteFileCommand.cxx
View file @
2db55ffa
...
...
@@ -63,8 +63,6 @@ bool cmWriteFileCommand
cmSystemTools
::
SetPermissions
(
fileName
.
c_str
(),
#if defined( _MSC_VER ) || defined( __MINGW32__ )
mode
|
S_IWRITE
#elif defined( __BORLANDC__ )
mode
|
S_IWUSR
#else
mode
|
S_IWUSR
|
S_IWGRP
#endif
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment