Merge pull request #2998 from kachanovskiy/master

Fix for #2997

Merge pull request #2998 from kachanovskiy/master
Fix for #2997
8d0d4c76 · Doron Somech · GitHub · 9079cf8e · eb76ea06 · 8d0d4c76
Unverified Commit 8d0d4c76 authored Mar 16, 2018 by Doron Somech Committed by GitHub Mar 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CMakeLists.txt tests/CMakeLists.txt +4 -0

No files found.
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -158,6 +158,10 @@ target_compile_definitions (unity PUBLIC "UNITY_USE_COMMAND_LINE_ARGS" "UNITY_EX
 target_include_directories (unity
    PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../external/unity")

+IF (MSVC_VERSION LESS 1700)
+    SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.c" PROPERTIES LANGUAGE CXX)
+ENDIF()
+
 # add library and include dirs for all targets
 if (BUILD_SHARED)
 link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity)