Author: chug
Date: Mon Jul 13 18:24:41 2015
New Revision: 1690787
URL: http://svn.apache.org/r1690787
Log:
QPID-6640: Adjust cmake 3.x generator name detection
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt?rev=1690787&r1=1690786&r2=1690787&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt Mon Jul 13 18:24:41
2015
@@ -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")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
