diff --git a/platformio/ide/tpls/clion/CMakeLists.txt.tpl b/platformio/ide/tpls/clion/CMakeLists.txt.tpl index 302fb6e1..83d4745f 100644 --- a/platformio/ide/tpls/clion/CMakeLists.txt.tpl +++ b/platformio/ide/tpls/clion/CMakeLists.txt.tpl @@ -6,10 +6,11 @@ # The `CMakeListsUser.txt` will not be overwritten by PlatformIO. cmake_minimum_required(VERSION 3.2) -project("{{project_name}}") include(CMakeListsPrivate.txt) +project("{{project_name}}") + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt) include(CMakeListsUser.txt) endif() diff --git a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl index c7c7c163..e4bc39e2 100644 --- a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl +++ b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl @@ -25,7 +25,7 @@ % envs = config.envs() % if len(envs) > 1: -set(CMAKE_CONFIGURATION_TYPES "{{ ";".join(envs) }}" CACHE STRING "" FORCE) +set(CMAKE_CONFIGURATION_TYPES "{{ ";".join(envs) }};" CACHE STRING "" FORCE) % else: set(CMAKE_CONFIGURATION_TYPES "{{ env_name }}" CACHE STRING "" FORCE) % end