Skip to content

Feature msvc clang #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 1, 2017
Merged

Feature msvc clang #141

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9eba823
Demonstrate that compiler is identified as MSVC when VS2014 Clang ext…
GabrielHare Dec 15, 2016
8f7a263
Increase CMake version to resolve developer warnings regarding implic…
GabrielHare Dec 15, 2016
c4ab9d3
Identify Clang compiler when used as an MSVC extension
GabrielHare Dec 15, 2016
bb49539
Revert "Increase CMake version to resolve developer warnings regardin…
GabrielHare Dec 15, 2016
a2fe238
Use “MATCHES” instead of “STREQUAL” to avoid ambiguous comparison.
GabrielHare Dec 15, 2016
0b15459
Downgrade message to STATUS and do not declare C++11 as a requirement.
GabrielHare Feb 3, 2017
ee99616
Merge branch 'master' into feature-MSVC-Clang
pjohnmeyer Jul 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ option(UTPP_AMPLIFY_WARNINGS

set(LIB_SUFFIX "" CACHE STRING "Identifier to add to end of lib directory name e.g. 64 for lib64")

if(MSVC14 OR MSVC12)
# has the support we need
if(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
# CHECK_CXX_COMPILER_FLAG could be used
# but MSVC version is preferred for feature requirements
if (MSVC14 OR MSVC12)
# has the support we need
else()
message(STATUS "The MSVC compiler version does not support UnitTest++ C++11 features.")
endif()
else()
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
Expand All @@ -24,7 +30,7 @@ else()
elseif(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
endif()
endif()

Expand Down