Merged master.

Author: OliverGlandberger

CMakeLists.txt

@@ -24,10 +24,8 @@ else()
     message(FATAL_ERROR "Invalid ${PROJECT_NAME}_OUTPUT_TYPE " ${${PROJECT_NAME}_OUTPUT_TYPE})
 endif()
 
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
-
 add_library(${PROJECT_NAME} ${LIB_TYPE}
         Network.cpp
         RTPacket.cpp
@@ -48,13 +46,11 @@ target_include_directories(${PROJECT_NAME}
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/External/tinyxml2
 )
 
-# Windows-specific linking
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME}
-        PUBLIC 
-            ws2_32 iphlpapi
-    )
-endif()
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC 
+        $<$<STREQUAL:$<PLATFORM_ID>,Windows>:ws2_32>
+        $<$<STREQUAL:$<PLATFORM_ID>,Windows>:iphlpapi>
+)
 
 # Enable C++14
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_14)