1 files changed, 20 insertions, 12 deletions
diff --git a/src/server/ipc/CMakeLists.txt b/src/server/ipc/CMakeLists.txt
index 2a865229af8..8469c922066 100644
--- a/src/server/ipc/CMakeLists.txt
+++ b/src/server/ipc/CMakeLists.txt
@@ -8,18 +8,26 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-file(GLOB_RECURSE sources_ipc *.cpp *.h)
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES)
 
-set(ipc_SRCS
-  ${sources_ipc}
-)
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/dep/zmqpp
-  ${CMAKE_SOURCE_DIR}/src/common
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${ZMQ_INCLUDE_DIR}
-)
+add_library(ipc ${PRIVATE_SOURCES})
 
-add_library(ipc STATIC ${ipc_SRCS})
+target_include_directories(ipc
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+target_link_libraries(ipc
+  PUBLIC
+    shared
+    zmqpp)
+
+set_target_properties(ipc
+    PROPERTIES
+      FOLDER
+        "server")