diff --git a/examples/goose_publisher/CMakeLists.txt b/examples/goose_publisher/CMakeLists.txt
index 7c5c508d..916abcd6 100644
--- a/examples/goose_publisher/CMakeLists.txt
+++ b/examples/goose_publisher/CMakeLists.txt
@@ -3,10 +3,12 @@ set(goose_publisher_example_SRCS
    goose_publisher_example.c
 )
 
-IF(WIN32)
+IF(MSVC)
 
 set_source_files_properties(${goose_publisher_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
+ENDIF(MSVC)                                       
+                                       
 add_executable(goose_publisher_example
   ${goose_publisher_example_SRCS}
 )
@@ -15,16 +17,4 @@ target_link_libraries(goose_publisher_example
     iec61850
 )
 
-ELSE(WIN32)
-
-add_executable(goose_publisher_example
-  ${goose_publisher_example_SRCS}
-)
-
-target_link_libraries(goose_publisher_example
-    iec61850
-)
-
-ENDIF(WIN32)
-
 
diff --git a/examples/goose_subscriber/CMakeLists.txt b/examples/goose_subscriber/CMakeLists.txt
index a5874fa4..2f219b14 100644
--- a/examples/goose_subscriber/CMakeLists.txt
+++ b/examples/goose_subscriber/CMakeLists.txt
@@ -3,10 +3,12 @@ set(goose_subscriber_example_SRCS
    goose_subscriber_example.c
 )
 
-IF(WIN32)
+IF(MSVC)
 
 set_source_files_properties(${goose_subscriber_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
+ENDIF(MSVC)
+                                       
 add_executable(goose_subscriber_example
   ${goose_subscriber_example_SRCS}
 )
@@ -15,16 +17,4 @@ target_link_libraries(goose_subscriber_example
     iec61850
 )
 
-ELSE(WIN32)
-
-add_executable(goose_subscriber_example
-  ${goose_subscriber_example_SRCS}
-)
-
-target_link_libraries(goose_subscriber_example
-    iec61850
-)
-
-ENDIF(WIN32)
-
 
diff --git a/examples/iec61850_9_2_LE_example/CMakeLists.txt b/examples/iec61850_9_2_LE_example/CMakeLists.txt
index 3351a014..8d3b2744 100644
--- a/examples/iec61850_9_2_LE_example/CMakeLists.txt
+++ b/examples/iec61850_9_2_LE_example/CMakeLists.txt
@@ -7,10 +7,10 @@ set(sv_9_2_LE_example_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${sv_9_2_LE_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(sv_9_2_LE_example
   ${sv_9_2_LE_example_SRCS}
diff --git a/examples/iec61850_client_example1/CMakeLists.txt b/examples/iec61850_client_example1/CMakeLists.txt
index 7d8b750a..6b75731a 100644
--- a/examples/iec61850_client_example1/CMakeLists.txt
+++ b/examples/iec61850_client_example1/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_example1_SRCS
    client_example1.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_example1_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_example1
   ${iec61850_client_example1_SRCS}
diff --git a/examples/iec61850_client_example2/CMakeLists.txt b/examples/iec61850_client_example2/CMakeLists.txt
index f9deba0e..3f15e31c 100644
--- a/examples/iec61850_client_example2/CMakeLists.txt
+++ b/examples/iec61850_client_example2/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_example2_SRCS
    client_example2.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_example2_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_example2
   ${iec61850_client_example2_SRCS}
diff --git a/examples/iec61850_client_example5/CMakeLists.txt b/examples/iec61850_client_example5/CMakeLists.txt
index 9c18a247..66191fc3 100644
--- a/examples/iec61850_client_example5/CMakeLists.txt
+++ b/examples/iec61850_client_example5/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_example5_SRCS
    client_example5.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_example5_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_example5
   ${iec61850_client_example5_SRCS}
diff --git a/examples/iec61850_client_example_array/CMakeLists.txt b/examples/iec61850_client_example_array/CMakeLists.txt
index a4d4b905..ec2e1dc1 100644
--- a/examples/iec61850_client_example_array/CMakeLists.txt
+++ b/examples/iec61850_client_example_array/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_example_array_SRCS
    client_example_array.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_example_array_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_example_array
   ${iec61850_client_example_array_SRCS}
diff --git a/examples/iec61850_client_example_async/CMakeLists.txt b/examples/iec61850_client_example_async/CMakeLists.txt
index 87ec9b79..dbab19de 100644
--- a/examples/iec61850_client_example_async/CMakeLists.txt
+++ b/examples/iec61850_client_example_async/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_async_SRCS
    client_example_async.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_async_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_async
   ${iec61850_client_async_SRCS}
diff --git a/examples/iec61850_client_example_control/CMakeLists.txt b/examples/iec61850_client_example_control/CMakeLists.txt
index bb612b44..a04ce7e0 100644
--- a/examples/iec61850_client_example_control/CMakeLists.txt
+++ b/examples/iec61850_client_example_control/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_example_control_SRCS
    client_example_control.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_example_control_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(client_example_control
   ${iec61850_client_example_control_SRCS}
diff --git a/examples/iec61850_client_example_no_thread/CMakeLists.txt b/examples/iec61850_client_example_no_thread/CMakeLists.txt
index 1d351b32..91e20069 100644
--- a/examples/iec61850_client_example_no_thread/CMakeLists.txt
+++ b/examples/iec61850_client_example_no_thread/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_no_thread_SRCS
    client_example_no_thread.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_no_thread_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_no_thread
   ${iec61850_client_no_thread_SRCS}
diff --git a/examples/iec61850_client_file_async/CMakeLists.txt b/examples/iec61850_client_file_async/CMakeLists.txt
index 6dc896e0..55986dde 100644
--- a/examples/iec61850_client_file_async/CMakeLists.txt
+++ b/examples/iec61850_client_file_async/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_client_file_async_SRCS
    client_example_async.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_client_file_async_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_client_file_async
   ${iec61850_client_file_async_SRCS}
diff --git a/examples/iec61850_sv_client_example/CMakeLists.txt b/examples/iec61850_sv_client_example/CMakeLists.txt
index 1b9b1334..f366db05 100644
--- a/examples/iec61850_sv_client_example/CMakeLists.txt
+++ b/examples/iec61850_sv_client_example/CMakeLists.txt
@@ -3,10 +3,10 @@ set(iec61850_sv_client_example_SRCS
    sv_client_example.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${iec61850_sv_client_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(iec61850_sv_client_example
   ${iec61850_sv_client_example_SRCS}
diff --git a/examples/mms_utility/CMakeLists.txt b/examples/mms_utility/CMakeLists.txt
index ddc157e0..ece58b9d 100644
--- a/examples/mms_utility/CMakeLists.txt
+++ b/examples/mms_utility/CMakeLists.txt
@@ -3,10 +3,10 @@ set(mms_utility_SRCS
    mms_utility.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${mms_utility_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(mms_utility
   ${mms_utility_SRCS}
diff --git a/examples/server_example_61400_25/CMakeLists.txt b/examples/server_example_61400_25/CMakeLists.txt
index 1f90cc89..0e829950 100644
--- a/examples/server_example_61400_25/CMakeLists.txt
+++ b/examples/server_example_61400_25/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_61400_25_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_61400_25_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_61400_25
   ${server_example_61400_25_SRCS}
diff --git a/examples/server_example_basic_io/CMakeLists.txt b/examples/server_example_basic_io/CMakeLists.txt
index 6ff774a9..22d1b3d4 100644
--- a/examples/server_example_basic_io/CMakeLists.txt
+++ b/examples/server_example_basic_io/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_basic_io
   ${server_example_SRCS}
diff --git a/examples/server_example_complex_array/CMakeLists.txt b/examples/server_example_complex_array/CMakeLists.txt
index 32a1f967..e53bb61c 100644
--- a/examples/server_example_complex_array/CMakeLists.txt
+++ b/examples/server_example_complex_array/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_ca_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_ca_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_ca
   ${server_example_ca_SRCS}
diff --git a/examples/server_example_config_file/CMakeLists.txt b/examples/server_example_config_file/CMakeLists.txt
index e56ea258..e43da414 100644
--- a/examples/server_example_config_file/CMakeLists.txt
+++ b/examples/server_example_config_file/CMakeLists.txt
@@ -6,10 +6,10 @@ set(server_example_config_file_SRCS
    server_example_config_file.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_config_file_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_config_file
   ${server_example_config_file_SRCS}
diff --git a/examples/server_example_control/CMakeLists.txt b/examples/server_example_control/CMakeLists.txt
index da6f9c63..10150060 100644
--- a/examples/server_example_control/CMakeLists.txt
+++ b/examples/server_example_control/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_control_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_control_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_control
   ${server_example_control_SRCS}
diff --git a/examples/server_example_dynamic/CMakeLists.txt b/examples/server_example_dynamic/CMakeLists.txt
index ebc14fcd..8efe7faa 100644
--- a/examples/server_example_dynamic/CMakeLists.txt
+++ b/examples/server_example_dynamic/CMakeLists.txt
@@ -6,10 +6,10 @@ set(server_example_dynamic_SRCS
    server_example_dynamic.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_dynamic_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_dynamic
   ${server_example_dynamic_SRCS}
diff --git a/examples/server_example_files/CMakeLists.txt b/examples/server_example_files/CMakeLists.txt
index a0dfc356..55788413 100644
--- a/examples/server_example_files/CMakeLists.txt
+++ b/examples/server_example_files/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_files
   ${server_example_SRCS}
diff --git a/examples/server_example_goose/CMakeLists.txt b/examples/server_example_goose/CMakeLists.txt
index 72658589..06237496 100644
--- a/examples/server_example_goose/CMakeLists.txt
+++ b/examples/server_example_goose/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_goose_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_goose_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_goose
   ${server_example_goose_SRCS}
diff --git a/examples/server_example_logging/CMakeLists.txt b/examples/server_example_logging/CMakeLists.txt
index b886461e..9c137b58 100644
--- a/examples/server_example_logging/CMakeLists.txt
+++ b/examples/server_example_logging/CMakeLists.txt
@@ -19,10 +19,10 @@ set(sqlite_SRCS
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION")
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_logging
   ${server_example_SRCS}
diff --git a/examples/server_example_password_auth/CMakeLists.txt b/examples/server_example_password_auth/CMakeLists.txt
index db7376d2..c19025fd 100644
--- a/examples/server_example_password_auth/CMakeLists.txt
+++ b/examples/server_example_password_auth/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_password_auth
   ${server_example_SRCS}
diff --git a/examples/server_example_setting_groups/CMakeLists.txt b/examples/server_example_setting_groups/CMakeLists.txt
index cb2d3cf0..53a43313 100644
--- a/examples/server_example_setting_groups/CMakeLists.txt
+++ b/examples/server_example_setting_groups/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_sg_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_sg_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_sg
   ${server_example_sg_SRCS}
diff --git a/examples/server_example_simple/CMakeLists.txt b/examples/server_example_simple/CMakeLists.txt
index f7884c94..be49d7cf 100644
--- a/examples/server_example_simple/CMakeLists.txt
+++ b/examples/server_example_simple/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_simple
   ${server_example_SRCS}
diff --git a/examples/server_example_substitution/CMakeLists.txt b/examples/server_example_substitution/CMakeLists.txt
index d9ae3512..fee32758 100644
--- a/examples/server_example_substitution/CMakeLists.txt
+++ b/examples/server_example_substitution/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_substitution
   ${server_example_SRCS}
diff --git a/examples/server_example_threadless/CMakeLists.txt b/examples/server_example_threadless/CMakeLists.txt
index 388f715b..471ca4ae 100644
--- a/examples/server_example_threadless/CMakeLists.txt
+++ b/examples/server_example_threadless/CMakeLists.txt
@@ -7,10 +7,10 @@ set(server_example_threadless_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${server_example_threadless_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 add_executable(server_example_threadless
   ${server_example_threadless_SRCS}
diff --git a/examples/server_example_write_handler/CMakeLists.txt b/examples/server_example_write_handler/CMakeLists.txt
index ebcf8d13..0d966b61 100644
--- a/examples/server_example_write_handler/CMakeLists.txt
+++ b/examples/server_example_write_handler/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_write_handler
   ${server_example_SRCS}
diff --git a/examples/sv_publisher/CMakeLists.txt b/examples/sv_publisher/CMakeLists.txt
index ebf8abd8..5a7ec64d 100644
--- a/examples/sv_publisher/CMakeLists.txt
+++ b/examples/sv_publisher/CMakeLists.txt
@@ -3,10 +3,12 @@ set(sv_publisher_example_SRCS
    sv_publisher_example.c
 )
 
-IF(WIN32)
+IF(MSVC)
 
 set_source_files_properties(${sv_publisher_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
+ENDIF(MSVC)
+                                       
 add_executable(sv_publisher_example
   ${sv_publisher_example_SRCS}
 )
@@ -15,16 +17,5 @@ target_link_libraries(sv_publisher_example
     iec61850
 )
 
-ELSE(WIN32)
-
-add_executable(sv_publisher_example
-  ${sv_publisher_example_SRCS}
-)
-
-target_link_libraries(sv_publisher_example
-    iec61850
-)
-
-ENDIF(WIN32)
 
 
diff --git a/examples/sv_subscriber/CMakeLists.txt b/examples/sv_subscriber/CMakeLists.txt
index 65071fbe..4d7aecb0 100644
--- a/examples/sv_subscriber/CMakeLists.txt
+++ b/examples/sv_subscriber/CMakeLists.txt
@@ -3,10 +3,12 @@ set(sv_subscriber_example_SRCS
    sv_subscriber_example.c
 )
 
-IF(WIN32)
+IF(MSVC)
 
 set_source_files_properties(${sv_subscriber_example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
+ENDIF(MSVC)
+                                       
 add_executable(sv_subscriber_example
   ${sv_subscriber_example_SRCS}
 )
@@ -15,16 +17,5 @@ target_link_libraries(sv_subscriber_example
     iec61850
 )
 
-ELSE(WIN32)
-
-add_executable(sv_subscriber_example
-  ${sv_subscriber_example_SRCS}
-)
-
-target_link_libraries(sv_subscriber_example
-    iec61850
-)
-
-ENDIF(WIN32)
 
 
diff --git a/examples/tls_client_example/CMakeLists.txt b/examples/tls_client_example/CMakeLists.txt
index afa63c11..b076a246 100644
--- a/examples/tls_client_example/CMakeLists.txt
+++ b/examples/tls_client_example/CMakeLists.txt
@@ -3,10 +3,10 @@ set(example_SRCS
    tls_client_example.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 configure_file(client1-key.pem client1-key.pem COPYONLY)
 configure_file(client1.cer client1.cer COPYONLY)
diff --git a/examples/tls_server_example/CMakeLists.txt b/examples/tls_server_example/CMakeLists.txt
index 0f1af99b..47f4228c 100644
--- a/examples/tls_server_example/CMakeLists.txt
+++ b/examples/tls_server_example/CMakeLists.txt
@@ -7,10 +7,10 @@ set(example_SRCS
    static_model.c
 )
 
-IF(WIN32)
+IF(MSVC)
 set_source_files_properties(${example_SRCS}
                                        PROPERTIES LANGUAGE CXX)
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 configure_file(server-key.pem server-key.pem COPYONLY)
 configure_file(server.cer server.cer COPYONLY)