diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-03 01:15:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-03 01:15:38 (GMT) |
| commit | 63b4952f4c125bcfd7bfa3c0fa13e2e48d975ea2 (patch) | |
| tree | 7602141bf0c179282e4e9905865efa469d8a155c | |
| parent | 4c0668b7daf8e3a53e65eeeb58757eea769bc482 (diff) | |
| download | CMake-63b4952f4c125bcfd7bfa3c0fa13e2e48d975ea2.zip CMake-63b4952f4c125bcfd7bfa3c0fa13e2e48d975ea2.tar.gz CMake-63b4952f4c125bcfd7bfa3c0fa13e2e48d975ea2.tar.bz2 | |
BUG: Removed odbc32.lib and odbccp32.lib from standard libraries on VS 8 because VC++ Express 2005 does not have them. They are SQL database access libraries and should not be needed for every application. User code can always explicitly link the library. Also replacing deprecated /GZ option with /RTC1 for VS 8. This addresses bug#2795.
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 8ea450f..300f2c5 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -152,11 +152,11 @@ IF(CMAKE_COMPILER_2005) SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2 /D NDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /D NDEBUG") SET (CMAKE_C_FLAGS_INIT "/W3 /Zm1000") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/MDd /Zi /Od /GZ") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/MDd /Zi /Od /RTC1") SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1 /D NDEBUG") SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /D NDEBUG") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /D NDEBUG") - SET (CMAKE_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comdlg32.lib advapi32.lib " CACHE STRING + SET (CMAKE_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib " CACHE STRING "Libraries linked by defalut with all applications.") ELSE(CMAKE_COMPILER_2005) IF(CMAKE_USING_VC_FREE_TOOLS) |