From 702cfefddbc1a8a83e113cec44ee09ecc9daf6db Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 5 Apr 2016 17:55:32 +0200 Subject: Buildsystem: Initial changes to support building with vs clang toolset (cherry picked from commit 4a3a178d7fe9d2d7e8fde2fe915cf5cec5223502) --- cmake/platform/win/settings.cmake | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'cmake/platform') diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake index da66daf0832..0c1a103304a 100644 --- a/cmake/platform/win/settings.cmake +++ b/cmake/platform/win/settings.cmake @@ -1,20 +1,9 @@ -# check the CMake preload parameters (commented out by default) +add_definitions(-D_WIN32_WINNT=0x0601) -# overload CMAKE_INSTALL_PREFIX if not being set properly -#if( WIN32 ) -# if( NOT CYGWIN ) -# if( NOT CMAKE_INSTALL_PREFIX ) -# set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin") -# endif() -# endif() -#endif() - -if (WIN32) - add_definitions(-D_WIN32_WINNT=0x0601) -endif() - -if ( MSVC ) +if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake) -elseif ( MINGW ) +elseif (CMAKE_CXX_PLATFORM_ID MATCHES "MinGW") include(${CMAKE_SOURCE_DIR}/cmake/compiler/mingw/settings.cmake) +elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) endif() -- cgit v1.2.3