platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 01:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix CLion generator when one env is used

Browse Source
This commit is contained in:
Ivan Kravets
2019-11-17 00:35:56 +02:00
parent 5b1c6daa2a
commit 7eab5d567e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformio/ide/tpls/clion/CMakeLists.txt.tpl
View File

@ -6,10 +6,11 @@
# The `CMakeListsUser.txt` will not be overwritten by PlatformIO. # The `CMakeListsUser.txt` will not be overwritten by PlatformIO.
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
project("{{project_name}}")
include(CMakeListsPrivate.txt) include(CMakeListsPrivate.txt)
project("{{project_name}}")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt)
include(CMakeListsUser.txt) include(CMakeListsUser.txt)
endif() endif()

2
platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl
View File

@ -25,7 +25,7 @@
% envs = config.envs() % envs = config.envs()
% if len(envs) > 1: % if len(envs) > 1:
set(CMAKE_CONFIGURATION_TYPES "{{ ";".join(envs) }}" CACHE STRING "" FORCE) set(CMAKE_CONFIGURATION_TYPES "{{ ";".join(envs) }};" CACHE STRING "" FORCE)
% else: % else:
set(CMAKE_CONFIGURATION_TYPES "{{ env_name }}" CACHE STRING "" FORCE) set(CMAKE_CONFIGURATION_TYPES "{{ env_name }}" CACHE STRING "" FORCE)
% end % end