From cf25806ea7b3a4d4b9c354ac0e25030d7785575b Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Mon, 13 Jul 2015 18:24:41 +0000 Subject: QPID-6640: Adjust cmake 3.x generator name detection git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1690787 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt b/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt index 4f66c80498..d791eca77b 100644 --- a/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt +++ b/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt @@ -157,8 +157,7 @@ if (MSVC) file(TO_NATIVE_PATH ${DOTNET_relPathToSrc} DOTNET_relPathToSrc) endif() - if((${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008") OR - (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64")) + if(${CMAKE_GENERATOR} MATCHES "^Visual Studio 9") # Visual Studio 2008 select_msvc9_files() set(DOTNET_MSVC_SELECT "msvc9") @@ -167,8 +166,7 @@ if (MSVC) set(DOTNET_TARGET_FRAMEWORK_VERSION "v3.5") set(DOTNET_PLATFORM_TOOLSET "") - elseif((${CMAKE_GENERATOR} STREQUAL "Visual Studio 10") OR - (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 Win64")) + elseif(${CMAKE_GENERATOR} MATCHES "^Visual Studio 10") # Visual Studio 2010 select_msvcx_files() set(DOTNET_MSVC_SELECT "msvcx") @@ -177,8 +175,7 @@ if (MSVC) set(DOTNET_TARGET_FRAMEWORK_VERSION "v4.0") set(DOTNET_PLATFORM_TOOLSET "") - elseif((${CMAKE_GENERATOR} STREQUAL "Visual Studio 11") OR - (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 Win64")) + elseif(${CMAKE_GENERATOR} MATCHES "^Visual Studio 11") # Visual Studio 2012 select_msvcx_files() set(DOTNET_MSVC_SELECT "msvcx") -- cgit v1.2.1