diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 7591594be..74442086b 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -48,6 +48,10 @@ MACRO(NL_DEFAULT_PROPS name label)
     SET_TARGET_PROPERTIES(${name} PROPERTIES
       PROJECT_LABEL ${label})
   ENDIF(${type} STREQUAL SHARED_LIBRARY)
+  IF(WITH_STLPORT)
+    SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "/X")
+  ENDIF(WITH_STLPORT)
+  
 ENDMACRO(NL_DEFAULT_PROPS)
 
 ###
@@ -291,11 +295,6 @@ MACRO(NL_SETUP_BUILD)
 
     SET(PLATFORM_CFLAGS "/D_CRT_SECURE_NO_WARNINGS /DWIN32 /D_WINDOWS /W3 /Zi /Zm1000")
 
-    IF(WITH_STLPORT)
-      # deactivate all global include paths
-      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} /X")
-    ENDIF(WITH_STLPORT)
-
     # Exceptions are only set for C++
     SET(PLATFORM_CXXFLAGS "${PLATFORM_CFLAGS} /EHa")