diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-08-28 16:10:25 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-08-29 01:55:00 +0000 |
| commit | f8d0a7f003c2916f08092da01c737294f1944eb8 (patch) | |
| tree | 73c218d2672ce04cc8ff5205107588e687e11529 | |
| parent | a303bc1f2982e59885c9787d3f81e1ced4b5f342 (diff) | |
CMake: We no longer support Visual C++ 2005 or 2008.
Change-Id: Ide3688366aa3c38d48ff29224dbfc0fdb7bf1b7a
Reviewed-on: https://code.wireshark.org/review/23277
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cmake/modules/FindGTK2.cmake | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a94cc571f..159ccb2176 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1465,13 +1465,6 @@ gmx_test_large_files(GMX_LARGEFILES) add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" ) -if(WIN32) - # Disable deprecation - if(MSVC80 OR MSVC90) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) - endif() -endif() - if (${GIT_EXECUTABLE}) set(GIT_BIN_PARAM "--git-bin ${GIT_EXECUTABLE}") endif() diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index f879b88d1c..8753295e42 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -336,11 +336,7 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) if(_expand_vc AND MSVC) # Add vc80/vc90/vc100 midfixes - if(MSVC80) - set(_library ${_library}-vc80) - elseif(MSVC90) - set(_library ${_library}-vc90) - elseif(MSVC10) + if(MSVC10) set(_library ${_library}-vc100) elseif(MSVC11) # Up to gtkmm-win 2.22.0-2 there are no vc110 libraries but vc100 can be used |