pragma-warning.diff
Public
Actions

Authored By

	aurelien
	Mar 8 2016, 9:01 AM

Size

1 KB

Referenced Files

None

Subscribers

None

pragma-warning.diff
View Options

	index 2010629..8ab93c4 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -754,6 +754,7 @@ if(WIN32)
	mitkFunctionCheckCompilerFlags("/wd4231" MITK_CXX_FLAGS) # warning C4231: nonstandard extension used : 'extern' before template explicit instantiation
	# the following line should be removed after fixing bug 17637
	mitkFunctionCheckCompilerFlags("/wd4316" MITK_CXX_FLAGS) # warning C4316: object alignment on heap
	+ mitkFunctionCheckCompilerFlags("/wd4180" MITK_CXX_FLAGS) # warning C4316: pragma
	endif()

	if(NOT MSVC_VERSION)
	diff --git a/Modules/CppMicroServices/CMakeLists.txt b/Modules/CppMicroServices/CMakeLists.txt
	index 9427072..2ea4019 100644
	--- a/Modules/CppMicroServices/CMakeLists.txt
	+++ b/Modules/CppMicroServices/CMakeLists.txt
	@@ -227,7 +227,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
	endif()

	if(MSVC)
	- set(US_CXX_FLAGS "/MP /WX /wd4996 /wd4251 /wd4503 ${US_CXX_FLAGS}")
	+ set(US_CXX_FLAGS "/MP /WX /wd4180 /wd4996 /wd4251 /wd4503 ${US_CXX_FLAGS}")
	endif()

	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${US_CXX_FLAGS}")

Attached To	Mode
No data available.

Patch which add /wd4180 for MSVC build in CppMicroServices