diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-08-22 20:57:45 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-08-22 20:57:45 (GMT) |
| commit | faf4b68ca91b6bc068dce1f988a2a36d612c60f5 (patch) | |
| tree | 6d9161f71238cfbdd4e9d3ebb69974a495cde092 /Tests | |
| parent | 0fdfab32d1c20c93dad0edc9e3f4b2b5cf4d0cf3 (diff) | |
| download | CMake-faf4b68ca91b6bc068dce1f988a2a36d612c60f5.zip CMake-faf4b68ca91b6bc068dce1f988a2a36d612c60f5.tar.gz CMake-faf4b68ca91b6bc068dce1f988a2a36d612c60f5.tar.bz2 | |
BUG: fix for borland and a shared CMakeLib
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 2 |
6 files changed, 18 insertions, 3 deletions
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 4b05d07..d9c7568 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -3,6 +3,11 @@ # PROJECT (Complex) +IF(BORLAND) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -tWR") + SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -tWR") +ENDIF(BORLAND) + # # Define a macro # diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index ce3619d..2779fcb 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -22,7 +22,7 @@ IF(WIN32) IF (CMAKE_DLL) CONFIGURE_FILE( ${CMAKE_DLL} - ${Complex_BINARY_DIR}/CMakeLib.dll COPYONLY) + ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY) ENDIF (CMAKE_DLL) ENDIF (WIN32) diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index 4b05d07..d9c7568 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -3,6 +3,11 @@ # PROJECT (Complex) +IF(BORLAND) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -tWR") + SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -tWR") +ENDIF(BORLAND) + # # Define a macro # diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index ce3619d..2779fcb 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -22,7 +22,7 @@ IF(WIN32) IF (CMAKE_DLL) CONFIGURE_FILE( ${CMAKE_DLL} - ${Complex_BINARY_DIR}/CMakeLib.dll COPYONLY) + ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY) ENDIF (CMAKE_DLL) ENDIF (WIN32) diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt index 4b05d07..d9c7568 100644 --- a/Tests/ComplexRelativePaths/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/CMakeLists.txt @@ -3,6 +3,11 @@ # PROJECT (Complex) +IF(BORLAND) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -tWR") + SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -tWR") +ENDIF(BORLAND) + # # Define a macro # diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index ce3619d..2779fcb 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -22,7 +22,7 @@ IF(WIN32) IF (CMAKE_DLL) CONFIGURE_FILE( ${CMAKE_DLL} - ${Complex_BINARY_DIR}/CMakeLib.dll COPYONLY) + ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY) ENDIF (CMAKE_DLL) ENDIF (WIN32) |