Generate appropriate project for CLion IDE and CVS // Resolve #523

This commit is contained in:
Ivan Kravets
2016-02-27 01:27:57 +02:00
parent 6d2130444d
commit 52bbe9af33
7 changed files with 132 additions and 133 deletions

View File

@ -12,6 +12,8 @@ PlatformIO 2.0
(`issue #527 <https://github.com/platformio/platformio/issues/527>`_)
* Improved handling of String-based ``CPPDEFINES`` passed to extra ``build_flags``
(`issue #526 <https://github.com/platformio/platformio/issues/526>`_)
* Generate appropriate project for CLion IDE and CVS
(`issue #523 <https://github.com/platformio/platformio/issues/523>`_)
* Fixed issue with incorrect handling of user's build flags where the base flags
were passed after user's flags to GCC compiler
(`issue #528 <https://github.com/platformio/platformio/issues/528>`_)

View File

@ -1 +1,2 @@
.pioenvs
CMakeListsLocal.txt

View File

@ -1,20 +1,13 @@
cmake_minimum_required(VERSION 3.2)
project(clion)
set(PLATFORMIO_CMD platformio)
include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoavr/variants/standard")
include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoavr/cores/arduino")
include_directories("$ENV{HOME}/.platformio/packages/toolchain-atmelavr/avr/include")
include_directories("$ENV{HOME}/.platformio/packages/toolchain-atmelavr/bfd/include")
include_directories("$ENV{HOME}/.platformio/packages/toolchain-atmelavr/lib/gcc/avr/4.8.1/include")
include_directories("$ENV{HOME}/.platformio/packages/toolchain-atmelavr/lib/gcc/avr/4.8.1/include-fixed")
include(CMakeListsLocal.txt)
add_definitions(-DF_CPU=16000000L)
add_definitions(-DARDUINO_ARCH_AVR)
add_definitions(-DARDUINO_AVR_UNO)
add_definitions(-DARDUINO=10607)
add_definitions(-DPLATFORMIO=020701)
add_definitions(-DPLATFORMIO=020805)
add_definitions(-D__AVR_ATmega328P__)
add_custom_target(

View File

@ -14,7 +14,7 @@
import sys
VERSION = (2, 8, "5.dev0")
VERSION = (2, 8, "5.dev1")
__version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio"

View File

@ -0,0 +1,2 @@
.pioenvs
CMakeListsLocal.txt

View File

@ -1,20 +1,7 @@
cmake_minimum_required(VERSION 3.2)
project({{project_name}})
set(ENV{PATH} "{{env_path}}")
set(PLATFORMIO_CMD "{{platformio_path}}")
% for include in includes:
% if include.startswith(user_home_dir):
% if "windows" in systype:
include_directories("$ENV{HOMEDRIVE}$ENV{HOMEPATH}{{include.replace(user_home_dir, '').replace("\\", "/")}}")
% else:
include_directories("$ENV{HOME}{{include.replace(user_home_dir, '').replace("\\", "/")}}")
% end
% else:
include_directories("{{include.replace("\\", "/")}}")
% end
% end
include(CMakeListsLocal.txt)
% for define in defines:
add_definitions(-D{{!define}})

View File

@ -0,0 +1,14 @@
set(ENV{PATH} "{{env_path}}")
set(PLATFORMIO_CMD "{{platformio_path}}")
% for include in includes:
% if include.startswith(user_home_dir):
% if "windows" in systype:
include_directories("$ENV{HOMEDRIVE}$ENV{HOMEPATH}{{include.replace(user_home_dir, '').replace("\\", "/")}}")
% else:
include_directories("$ENV{HOME}{{include.replace(user_home_dir, '').replace("\\", "/")}}")
% end
% else:
include_directories("{{include.replace("\\", "/")}}")
% end
% end