diff --git a/src/modules/graphic/osggraph/CMakeLists.txt b/src/modules/graphic/osggraph/CMakeLists.txt
index 0eadd356a..914ba0834 100644
--- a/src/modules/graphic/osggraph/CMakeLists.txt
+++ b/src/modules/graphic/osggraph/CMakeLists.txt
@@ -38,7 +38,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
    # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Other sources and headers needed for having them available in IDEs.
diff --git a/src/modules/graphic/ssggraph/CMakeLists.txt b/src/modules/graphic/ssggraph/CMakeLists.txt
index 6f56c76ed..7e8de3341 100644
--- a/src/modules/graphic/ssggraph/CMakeLists.txt
+++ b/src/modules/graphic/ssggraph/CMakeLists.txt
@@ -51,7 +51,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
    # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Other sources and headers needed for having them available in IDEs.
diff --git a/src/modules/racing/genparoptv1/CMakeLists.txt b/src/modules/racing/genparoptv1/CMakeLists.txt
index 0322713dc..9bb0f789c 100644
--- a/src/modules/racing/genparoptv1/CMakeLists.txt
+++ b/src/modules/racing/genparoptv1/CMakeLists.txt
@@ -35,7 +35,7 @@ ENDIF(WIN32)
     
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Other source files  and headers needed for having them available in IDEs.
diff --git a/src/modules/racing/standardgame/CMakeLists.txt b/src/modules/racing/standardgame/CMakeLists.txt
index e6bc340a9..0756a06ad 100644
--- a/src/modules/racing/standardgame/CMakeLists.txt
+++ b/src/modules/racing/standardgame/CMakeLists.txt
@@ -35,7 +35,7 @@ ENDIF(WIN32)
     
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Other source files  and headers needed for having them available in IDEs.
diff --git a/src/modules/simu/simuv2.1/CMakeLists.txt b/src/modules/simu/simuv2.1/CMakeLists.txt
index e8ecf3e62..1dcb93134 100644
--- a/src/modules/simu/simuv2.1/CMakeLists.txt
+++ b/src/modules/simu/simuv2.1/CMakeLists.txt
@@ -15,7 +15,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 SET(SIMU_SOURCES aero.cpp axle.cpp brake.cpp car.cpp categories.cpp
diff --git a/src/modules/simu/simuv2/CMakeLists.txt b/src/modules/simu/simuv2/CMakeLists.txt
index 6a49a7d86..53c9469a8 100644
--- a/src/modules/simu/simuv2/CMakeLists.txt
+++ b/src/modules/simu/simuv2/CMakeLists.txt
@@ -27,7 +27,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Headers needed for having them available in IDEs.
diff --git a/src/modules/simu/simuv3/CMakeLists.txt b/src/modules/simu/simuv3/CMakeLists.txt
index 26609a826..309e527fa 100644
--- a/src/modules/simu/simuv3/CMakeLists.txt
+++ b/src/modules/simu/simuv3/CMakeLists.txt
@@ -28,7 +28,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Headers and other sources needed for having them available in IDEs.
diff --git a/src/modules/simu/simuv4/CMakeLists.txt b/src/modules/simu/simuv4/CMakeLists.txt
index 31e30fe69..c2c26b7a2 100644
--- a/src/modules/simu/simuv4/CMakeLists.txt
+++ b/src/modules/simu/simuv4/CMakeLists.txt
@@ -17,7 +17,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 SET(SIMU_SOURCES aero.cpp axle.cpp brake.cpp car.cpp categories.cpp
diff --git a/src/modules/sound/snddefault/CMakeLists.txt b/src/modules/sound/snddefault/CMakeLists.txt
index 8998fe898..a60d8fc8b 100644
--- a/src/modules/sound/snddefault/CMakeLists.txt
+++ b/src/modules/sound/snddefault/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Headers and other source files needed for having them available in IDEs.
diff --git a/src/modules/track/trackv1/CMakeLists.txt b/src/modules/track/trackv1/CMakeLists.txt
index 71ff1be70..5a1cc6119 100644
--- a/src/modules/track/trackv1/CMakeLists.txt
+++ b/src/modules/track/trackv1/CMakeLists.txt
@@ -14,7 +14,7 @@ ENDIF(WIN32)
 
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Note: Headers needed for having them available in IDEs.
diff --git a/src/modules/userinterface/legacymenu/CMakeLists.txt b/src/modules/userinterface/legacymenu/CMakeLists.txt
index 8f5f13b0c..66ef141ed 100644
--- a/src/modules/userinterface/legacymenu/CMakeLists.txt
+++ b/src/modules/userinterface/legacymenu/CMakeLists.txt
@@ -63,7 +63,7 @@ ENDIF(WIN32)
     
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Disable developer warning
diff --git a/src/modules/userinterface/textonly/CMakeLists.txt b/src/modules/userinterface/textonly/CMakeLists.txt
index 0b65fd08e..61cf8a251 100644
--- a/src/modules/userinterface/textonly/CMakeLists.txt
+++ b/src/modules/userinterface/textonly/CMakeLists.txt
@@ -17,7 +17,7 @@ ENDIF(WIN32)
     
 IF(MSVC)
     # Ignore some run-time libs to avoid link time warnings and sometimes even crashes.
-    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt.lib")
 ENDIF(MSVC)
 
 # Disable developer warning