diff --git a/src/apps/deskflow-client/CMakeLists.txt b/src/apps/deskflow-client/CMakeLists.txt
index 326630bcc..46c2d8c7a 100644
--- a/src/apps/deskflow-client/CMakeLists.txt
+++ b/src/apps/deskflow-client/CMakeLists.txt
@@ -113,11 +113,11 @@ target_link_libraries(
   app
   ${libs})
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(APPLE)
   set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif(UNIX)
   install(TARGETS ${target} DESTINATION bin)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+elseif(WIN32)
   install(
     TARGETS ${target}
     RUNTIME_DEPENDENCY_SET clientDeps
diff --git a/src/apps/deskflow-core/CMakeLists.txt b/src/apps/deskflow-core/CMakeLists.txt
index 235c3ed38..628c3b64d 100644
--- a/src/apps/deskflow-core/CMakeLists.txt
+++ b/src/apps/deskflow-core/CMakeLists.txt
@@ -43,11 +43,11 @@ target_link_libraries(
   app
   ${libs})
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(APPLE)
   set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif(UNIX)
   install(TARGETS ${target} DESTINATION bin)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+elseif(WIN32)
   install(
     TARGETS ${target}
     RUNTIME_DEPENDENCY_SET coreDeps
diff --git a/src/apps/deskflow-server/CMakeLists.txt b/src/apps/deskflow-server/CMakeLists.txt
index 34f38844f..203f76096 100644
--- a/src/apps/deskflow-server/CMakeLists.txt
+++ b/src/apps/deskflow-server/CMakeLists.txt
@@ -117,11 +117,11 @@ target_link_libraries(
   app
   ${libs})
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(APPLE)
   set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif(UNIX)
   install(TARGETS ${target} DESTINATION bin)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+elseif(WIN32)
   install(
     TARGETS ${target}
     RUNTIME_DEPENDENCY_SET serverDeps