diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-21 19:08:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-21 19:08:03 (GMT) |
| commit | 210230e216764144b9a0112799d4c9046c3a8dd9 (patch) | |
| tree | ed6c88b0e4edf5eac1e0e000cd38b9d677ed33a2 /Utilities | |
| parent | ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c (diff) | |
| parent | 2db55ffa56a69c4b55410afb9b40ab20f4025837 (diff) | |
| download | CMake-210230e216764144b9a0112799d4c9046c3a8dd9.zip CMake-210230e216764144b9a0112799d4c9046c3a8dd9.tar.gz CMake-210230e216764144b9a0112799d4c9046c3a8dd9.tar.bz2 | |
Merge topic 'remove-borland-build'
2db55ffa Remove borland workarounds.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/cmliblzma/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/cmzlib/CMakeLists.txt | 10 |
4 files changed, 4 insertions, 15 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 03f10a0..97fd2ff 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -19,11 +19,6 @@ SET(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}") SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}") SET(CMAKE_REQUIRED_FLAGS ${CMAKE_ANSI_CFLAGS}) -# Disable warnings on Borland to avoid changing 3rd party code. -IF(BORLAND) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") -ENDIF(BORLAND) - # If we are on AIX, do the _ALL_SOURCE magic IF(${CMAKE_SYSTEM_NAME} MATCHES AIX) SET(_ALL_SOURCE 1) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index f1459d4..220a4c6 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -61,8 +61,6 @@ IF("${CMAKE_C_COMPILER_ID}" MATCHES SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") ELSEIF("${CMAKE_C_COMPILER_ID}" MATCHES "^(PathScale)$") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") -ELSEIF(BORLAND) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") ENDIF() # Enable CTest/CDash support diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt index 23549c5..27ec2d0 100644 --- a/Utilities/cmliblzma/CMakeLists.txt +++ b/Utilities/cmliblzma/CMakeLists.txt @@ -206,8 +206,6 @@ IF("${CMAKE_C_COMPILER_ID}" MATCHES SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") ELSEIF("${CMAKE_C_COMPILER_ID}" MATCHES "^(PathScale)$") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") -ELSEIF(BORLAND) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") ENDIF() ADD_LIBRARY(cmliblzma ${LZMA_SRCS}) diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt index f161056..66e8be2 100644 --- a/Utilities/cmzlib/CMakeLists.txt +++ b/Utilities/cmzlib/CMakeLists.txt @@ -18,12 +18,10 @@ IF(WIN32) IF(BUILD_SHARED_LIBS) SET(ZLIB_DLL 1) IF(NOT UNIX) - IF(NOT BORLAND) - IF(NOT MINGW) - SET(ZLIB_SRCS ${ZLIB_SRCS} zlib.def zlib.rc ) - ENDIF(NOT MINGW) - ENDIF(NOT BORLAND) - ENDIF(NOT UNIX) + IF(NOT MINGW) + SET(ZLIB_SRCS ${ZLIB_SRCS} zlib.def zlib.rc ) + ENDIF(NOT MINGW) + ENDIF(NOT UNIX) ENDIF(BUILD_SHARED_LIBS) ENDIF(WIN32) |