From a556573a4fa80f840c2382a6bc4b0c7e5e997cec Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros08@gmail.com>
Date: Tue, 21 Apr 2020 22:01:07 +0300
Subject: [PATCH] Move env dependent directories to appropriate
 CMAKE_BUILD_TYPE // Issue #3460

This will allow to dynamically populate list of sources depending on
selected environment. At the same time "src" and "lib" folders remain
common for all environments
---
 .../ide/tpls/clion/CMakeListsPrivate.txt.tpl  | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
index 79da3dc9..a974ee4f 100644
--- a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
@@ -39,6 +39,12 @@
 %   return to_unix_path(text).replace('"', '\\"')
 % end
 %
+% def _get_lib_dirs(envname):
+%   env_libdeps_dir = os.path.join(config.get_optional_dir("libdeps"), envname)
+%   env_lib_extra_dirs = config.get("env:" + envname, "lib_extra_dirs", [])
+%   return _fix_lib_dirs([env_libdeps_dir] + env_lib_extra_dirs)
+% end
+%
 % envs = config.envs()
 
 
@@ -75,6 +81,12 @@ if (CMAKE_BUILD_TYPE MATCHES "{{ env_name }}")
 % for include in filter_includes(includes):
     include_directories("{{ _normalize_path(include) }}")
 % end
+
+    FILE(GLOB_RECURSE EXTRA_LIB_SOURCES
+% for dir in _get_lib_dirs(env_name):
+        {{  _normalize_path(dir) + "/*.*" }}
+% end
+    )
 endif()
 
 % leftover_envs = list(set(envs) ^ set([env_name]))
@@ -93,13 +105,19 @@ if (CMAKE_BUILD_TYPE MATCHES "{{ env }}")
 %   for include in filter_includes(data["includes"]):
     include_directories("{{ _normalize_path(to_unix_path(include)) }}")
 %   end
+
+    FILE(GLOB_RECURSE EXTRA_LIB_SOURCES
+%   for dir in _get_lib_dirs(env):
+        {{  _normalize_path(dir) + "/*.*" }}
+%   end
+    )
 endif()
 % end
-%
-% lib_extra_dirs = _fix_lib_dirs(config.get("env:" + env_name, "lib_extra_dirs", []))
-% src_paths = [project_src_dir, project_lib_dir, project_libdeps_dir] + lib_extra_dirs
+
 FILE(GLOB_RECURSE SRC_LIST
-%   for path in src_paths:
+%   for path in (project_src_dir, project_lib_dir):
     {{  _normalize_path(path) + "/*.*" }}
 %   end
 )
+
+list(APPEND SRC_LIST ${EXTRA_LIB_SOURCES})