diff --git a/Modules/DiffusionImaging/Connectomics/CMakeLists.txt b/Modules/DiffusionImaging/Connectomics/CMakeLists.txt
index 713dac3df2..1567eca7ed 100644
--- a/Modules/DiffusionImaging/Connectomics/CMakeLists.txt
+++ b/Modules/DiffusionImaging/Connectomics/CMakeLists.txt
@@ -1,21 +1,24 @@
 # Boost throws a lot of unused variable warnings on linux
 
 if(UNIX)
   mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=unused-variable" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=unneeded-internal-declaration" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-  # there are additional warnings in boost headers in Release mode with special gcc versions
-  if(CMAKE_BUILD_TYPE STREQUAL "Release" AND ${GCC_VERSION} VERSION_GREATER "4.8.1" AND ${GCC_VERSION} VERSION_LESS "4.9.0")
+endif()
+
+# there are additional warnings in boost headers in Release mode with special gcc versions
+if(CMAKE_COMPILER_IS_GNUCXX)
+  if (CMAKE_BUILD_TYPE STREQUAL "Release" AND ${GCC_VERSION} VERSION_GREATER "4.8.1" AND ${GCC_VERSION} VERSION_LESS "4.9.0")
     mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=maybe-uninitialized" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
     mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=unused-parameter" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   endif()
 endif()
 
 MITK_CREATE_MODULE( Connectomics
   SUBPROJECTS MITK-DTI
   INCLUDE_DIRS Algorithms IODataStructures Rendering ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS DiffusionCore FiberTracking
   PACKAGE_DEPENDS VTK|vtkInfovisLayout
   WARNINGS_AS_ERRORS
 )
 
 add_subdirectory(Testing)