From 93d37282d9d7f4050a7fc682de8abea01996f113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 17 Jul 2018 15:42:06 +0200
Subject: [PATCH] [build] organize CMake targets in folders for IDEs

---
 CMakeLists.txt          | 2 ++
 cmake/benchmark.cmake   | 2 ++
 cmake/core.cmake        | 2 ++
 cmake/filesource.cmake  | 2 ++
 cmake/glfw.cmake        | 2 ++
 cmake/loop-darwin.cmake | 2 ++
 cmake/mbgl.cmake        | 2 ++
 cmake/node.cmake        | 3 +++
 cmake/offline.cmake     | 2 ++
 cmake/render.cmake      | 2 ++
 cmake/test.cmake        | 2 ++
 11 files changed, 23 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9127b872e..a889dbc37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,8 @@ if($ENV{CI})
     add_compile_options(-DCI_BUILD=1)
 endif()
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD)
     exec_program(
         "git"
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
index ea5b3dfa7..98fa4dac6 100644
--- a/cmake/benchmark.cmake
+++ b/cmake/benchmark.cmake
@@ -24,6 +24,8 @@ mbgl_platform_benchmark()
 
 create_source_groups(mbgl-benchmark)
 
+set_target_properties(mbgl-benchmark PROPERTIES FOLDER "Executables")
+
 initialize_xcode_cxx_build_settings(mbgl-benchmark)
 
 xcode_create_scheme(
diff --git a/cmake/core.cmake b/cmake/core.cmake
index 43ec141b7..436c76718 100644
--- a/cmake/core.cmake
+++ b/cmake/core.cmake
@@ -27,6 +27,8 @@ mbgl_platform_core()
 
 create_source_groups(mbgl-core)
 
+set_target_properties(mbgl-core PROPERTIES FOLDER "Core")
+
 xcode_create_scheme(TARGET mbgl-core)
 
 initialize_xcode_cxx_build_settings(mbgl-core)
diff --git a/cmake/filesource.cmake b/cmake/filesource.cmake
index 5dc706340..ccd2192f3 100644
--- a/cmake/filesource.cmake
+++ b/cmake/filesource.cmake
@@ -45,6 +45,8 @@ mbgl_filesource()
 
 create_source_groups(mbgl-filesource)
 
+set_target_properties(mbgl-filesource PROPERTIES FOLDER "Core")
+
 xcode_create_scheme(TARGET mbgl-filesource)
 
 initialize_xcode_cxx_build_settings(mbgl-filesource)
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index 2b2cb47ec..c59ca013d 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -31,6 +31,8 @@ mbgl_platform_glfw()
 
 create_source_groups(mbgl-glfw)
 
+set_target_properties(mbgl-glfw PROPERTIES FOLDER "Executables")
+
 initialize_xcode_cxx_build_settings(mbgl-glfw)
 
 xcode_create_scheme(
diff --git a/cmake/loop-darwin.cmake b/cmake/loop-darwin.cmake
index 692aecb8a..3109911e6 100644
--- a/cmake/loop-darwin.cmake
+++ b/cmake/loop-darwin.cmake
@@ -11,4 +11,6 @@ target_include_directories(mbgl-loop-darwin
 
 create_source_groups(mbgl-loop-darwin)
 
+set_target_properties(mbgl-loop-darwin PROPERTIES FOLDER "Core")
+
 xcode_create_scheme(TARGET mbgl-loop-darwin)
\ No newline at end of file
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake
index f67fbd3b4..0809d911a 100644
--- a/cmake/mbgl.cmake
+++ b/cmake/mbgl.cmake
@@ -80,6 +80,7 @@ if(WITH_NODEJS)
         WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
         COMMENT "Updating submodules..."
     )
+    set_target_properties(update-submodules PROPERTIES FOLDER "Misc")
 
     # Run npm install for both directories, and add custom commands, and a target that depends on them.
     _npm_install("${CMAKE_SOURCE_DIR}" mapbox-gl-native update-submodules)
@@ -88,6 +89,7 @@ if(WITH_NODEJS)
         npm-install ALL
         DEPENDS "${CMAKE_SOURCE_DIR}/node_modules/.mapbox-gl-js.stamp"
     )
+    set_target_properties(npm-install PROPERTIES FOLDER "Misc")
 endif()
 
 # Generate source groups so the files are properly sorted in IDEs like Xcode.
diff --git a/cmake/node.cmake b/cmake/node.cmake
index 218b7548f..103d99b6a 100644
--- a/cmake/node.cmake
+++ b/cmake/node.cmake
@@ -58,8 +58,10 @@ target_link_libraries(mbgl-node INTERFACE
 )
 
 target_add_mason_package(mbgl-node INTERFACE geojson)
+set_target_properties(mbgl-node.all PROPERTIES FOLDER "Node.js")
 
 add_custom_target(mbgl-node.active DEPENDS mbgl-node.abi-${NodeJS_ABI})
+set_target_properties(mbgl-node.active PROPERTIES FOLDER "Node.js")
 
 mbgl_platform_node()
 
@@ -67,6 +69,7 @@ create_source_groups(mbgl-node)
 
 foreach(ABI IN LISTS mbgl-node::abis)
     initialize_xcode_cxx_build_settings(mbgl-node.abi-${ABI})
+    set_target_properties(mbgl-node.abi-${ABI} PROPERTIES FOLDER "Node.js")
     xcode_create_scheme(
         TARGET mbgl-node.abi-${ABI}
         NAME "mbgl-node (ABI ${ABI})"
diff --git a/cmake/offline.cmake b/cmake/offline.cmake
index 13b6c3fe7..d9dfb6c6e 100644
--- a/cmake/offline.cmake
+++ b/cmake/offline.cmake
@@ -21,6 +21,8 @@ mbgl_platform_offline()
 
 create_source_groups(mbgl-offline)
 
+set_target_properties(mbgl-offline PROPERTIES FOLDER "Executables")
+
 xcode_create_scheme(
     TARGET mbgl-offline
     OPTIONAL_ARGS
diff --git a/cmake/render.cmake b/cmake/render.cmake
index c6e7d9dd5..781b7ff2a 100644
--- a/cmake/render.cmake
+++ b/cmake/render.cmake
@@ -20,6 +20,8 @@ create_source_groups(mbgl-render)
 
 initialize_xcode_cxx_build_settings(mbgl-render)
 
+set_target_properties(mbgl-render PROPERTIES FOLDER "Executables")
+
 xcode_create_scheme(
     TARGET mbgl-render
     OPTIONAL_ARGS
diff --git a/cmake/test.cmake b/cmake/test.cmake
index d6a256597..c13ad866c 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -43,6 +43,8 @@ create_source_groups(mbgl-test)
 
 initialize_xcode_cxx_build_settings(mbgl-test)
 
+set_target_properties(mbgl-test PROPERTIES FOLDER "Executables")
+
 xcode_create_scheme(
     TARGET mbgl-test
     OPTIONAL_ARGS