3 files changed, 23 insertions, 60 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 4aef665cc6f..326a8883e4c 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -8,10 +8,14 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-CollectSourceFiles(
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(common)
+
+CollectAndAddSourceFiles(
+  common
   ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE_SOURCES
-  # Exclude
+  EXCLUDE
   ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Windows
   ${CMAKE_CURRENT_SOURCE_DIR}/Platform
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
@@ -19,43 +23,20 @@ CollectSourceFiles(
   ${CMAKE_CURRENT_SOURCE_DIR}/network)
 
 if(WIN32)
-  CollectSourceFiles(
+  CollectAndAddSourceFiles(
+    common
     ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Windows
-    WINDOWS_DEBUGGING_SOURCES)
-  list(APPEND PRIVATE_SOURCES
-    ${WINDOWS_DEBUGGING_SOURCES})
-  CollectSourceFiles(
+    BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+  CollectAndAddSourceFiles(
+    common
     ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Windows
-    WINDOWS_PLATFORM_SOURCES)
-  list(APPEND PRIVATE_SOURCES
-    ${WINDOWS_PLATFORM_SOURCES})
-  unset(WINDOWS_DEBUGGING_SOURCES)
-  unset(WINDOWS_PLATFORM_SOURCES)
+    BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
-if(USE_COREPCH)
-  set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h)
-endif(USE_COREPCH)
-
-GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
-
-add_library(common
-  ${PRIVATE_SOURCES}
-)
-
-CollectIncludeDirectories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${CMAKE_CURRENT_SOURCE_DIR}/mmaps_common
-  ${CMAKE_CURRENT_SOURCE_DIR}/network)
-
 target_include_directories(common
   PUBLIC
     # Provide the binary dir for all child targets
     ${CMAKE_BINARY_DIR}
-    ${PUBLIC_INCLUDES}
   PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -98,12 +79,8 @@ endif()
 
 # Generate precompiled header
 if(USE_COREPCH)
-  add_cxx_pch(common ${PRIVATE_PCH_HEADER})
+  add_cxx_pch(common PrecompiledHeaders/commonPCH.h)
 endif()
 
-unset(PRIVATE_SOURCES)
-unset(PRIVATE_PCH_HEADER)
-unset(PUBLIC_INCLUDES)
-
 add_subdirectory(mmaps_common)
 add_subdirectory(network)
diff --git a/src/common/mmaps_common/CMakeLists.txt b/src/common/mmaps_common/CMakeLists.txt
index 2a65e8d5963..a6a27095a39 100644
--- a/src/common/mmaps_common/CMakeLists.txt
+++ b/src/common/mmaps_common/CMakeLists.txt
@@ -8,18 +8,13 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-CollectSourceFiles(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE_SOURCES)
-
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
-CollectIncludeDirectories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES
-)
+add_library(mmaps_common)
 
-add_library(mmaps_common ${PRIVATE_SOURCES})
+CollectAndAddSourceFiles(
+  mmaps_common
+  ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(mmaps_common
   PRIVATE
@@ -29,10 +24,6 @@ target_link_libraries(mmaps_common
     Recast
     Detour)
 
-target_include_directories(mmaps_common
-  PUBLIC
-    ${PUBLIC_INCLUDES})
-
 set_target_properties(mmaps_common
   PROPERTIES
     COMPILE_WARNING_AS_ERROR ${WITH_WARNINGS_AS_ERRORS}
diff --git a/src/common/network/CMakeLists.txt b/src/common/network/CMakeLists.txt
index d1e900680d4..9f30b3c841c 100644
--- a/src/common/network/CMakeLists.txt
+++ b/src/common/network/CMakeLists.txt
@@ -8,22 +8,17 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-CollectSourceFiles(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PRIVATE_SOURCES)
-
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(network
-  ${PRIVATE_SOURCES})
+add_library(network)
 
-CollectIncludeDirectories(
+CollectAndAddSourceFiles(
+  network
   ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES)
+  EXCLUDE
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
 target_include_directories(network
-  PUBLIC
-    ${PUBLIC_INCLUDES}
   PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR})