diff --git a/examples/goose_observer/CMakeLists.txt b/examples/goose_observer/CMakeLists.txt
index dae58f29..d8701a24 100644
--- a/examples/goose_observer/CMakeLists.txt
+++ b/examples/goose_observer/CMakeLists.txt
@@ -3,19 +3,12 @@ set(goose_observer_SRCS
    goose_observer.c
 )
 
-IF(WIN32)
+IF(MSVC)
 
 set_source_files_properties(${goose_observer_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-add_executable(goose_observer
-  ${goose_observer_SRCS}
-)
-
-target_link_libraries(goose_observer
-    iec61850
-)
-
-ELSE(WIN32)
+                                       
+ENDIF(MSVC)
 
 add_executable(goose_observer
   ${goose_observer_SRCS}
@@ -25,6 +18,4 @@ target_link_libraries(goose_observer
     iec61850
 )
 
-ENDIF(WIN32)
-
 
diff --git a/examples/server_example_service_tracking/CMakeLists.txt b/examples/server_example_service_tracking/CMakeLists.txt
index 0bbd87e4..a11e7d8d 100644
--- a/examples/server_example_service_tracking/CMakeLists.txt
+++ b/examples/server_example_service_tracking/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_service_tracking
   ${server_example_SRCS}