diff --git a/CMakeLists.txt b/CMakeLists.txt index 65d76a975a..b6ac4231ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2379,15 +2379,6 @@ if(NOT CURL_DISABLE_INSTALL) install(FILES ${_version_config} ${_project_config} DESTINATION ${_install_cmake_dir}) - # Workaround for MSVS10 to avoid the Dialog Hell - # FIXME: This could be removed with future version of CMake. - if(MSVC_VERSION EQUAL 1600) - set(_curl_sln_filename "${CMAKE_CURRENT_BINARY_DIR}/CURL.sln") - if(EXISTS "${_curl_sln_filename}") - file(APPEND "${_curl_sln_filename}" "\n# This should be regenerated!\n") - endif() - endif() - if(NOT TARGET curl_uninstall) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/CMake/cmake_uninstall.cmake.in" diff --git a/lib/config-win32.h b/lib/config-win32.h index d0c551f160..e5066befa1 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -460,7 +460,7 @@ Vista #ifndef CURL_OS #if defined(_M_IX86) || defined(__i386__) /* x86 (MSVC or gcc) */ #define CURL_OS "i386-pc-win32" -#elif defined(_M_X64) || defined(__x86_64__) /* x86_64 (MSVC >=2005 or gcc) */ +#elif defined(_M_X64) || defined(__x86_64__) /* x86_64 (VS2005+ or gcc) */ #define CURL_OS "x86_64-pc-win32" #elif defined(_M_IA64) || defined(__ia64__) /* Itanium */ #define CURL_OS "ia64-pc-win32"