From 98026d83b6cf5e740bf963ccecad7836b81646b5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 29 Feb 2016 17:33:08 +0200 Subject: [PATCH] Rename CMakeListsLocal.txt to CMakeListsPrivate.txt // Issue #523 --- examples/ide/clion/.gitignore | 2 +- examples/ide/clion/.idea/encodings.xml | 6 ++++++ examples/ide/clion/CMakeLists.txt | 2 +- platformio/ide/tpls/clion/.gitignore.tpl | 2 +- platformio/ide/tpls/clion/CMakeLists.txt.tpl | 2 +- .../{CMakeListsLocal.txt.tpl => CMakeListsPrivate.txt.tpl} | 0 6 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 examples/ide/clion/.idea/encodings.xml rename platformio/ide/tpls/clion/{CMakeListsLocal.txt.tpl => CMakeListsPrivate.txt.tpl} (100%) diff --git a/examples/ide/clion/.gitignore b/examples/ide/clion/.gitignore index 47eb5a54..a9fe6864 100644 --- a/examples/ide/clion/.gitignore +++ b/examples/ide/clion/.gitignore @@ -1,2 +1,2 @@ .pioenvs -CMakeListsLocal.txt +CMakeListsPrivate.txt diff --git a/examples/ide/clion/.idea/encodings.xml b/examples/ide/clion/.idea/encodings.xml new file mode 100644 index 00000000..97626ba4 --- /dev/null +++ b/examples/ide/clion/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/ide/clion/CMakeLists.txt b/examples/ide/clion/CMakeLists.txt index 259ea540..b70e0173 100644 --- a/examples/ide/clion/CMakeLists.txt +++ b/examples/ide/clion/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.2) project(clion) -include(CMakeListsLocal.txt) +include(CMakeListsPrivate.txt) add_definitions(-DF_CPU=16000000L) add_definitions(-DARDUINO_ARCH_AVR) diff --git a/platformio/ide/tpls/clion/.gitignore.tpl b/platformio/ide/tpls/clion/.gitignore.tpl index 47eb5a54..a9fe6864 100644 --- a/platformio/ide/tpls/clion/.gitignore.tpl +++ b/platformio/ide/tpls/clion/.gitignore.tpl @@ -1,2 +1,2 @@ .pioenvs -CMakeListsLocal.txt +CMakeListsPrivate.txt diff --git a/platformio/ide/tpls/clion/CMakeLists.txt.tpl b/platformio/ide/tpls/clion/CMakeLists.txt.tpl index eaa99d78..25a7b79e 100644 --- a/platformio/ide/tpls/clion/CMakeLists.txt.tpl +++ b/platformio/ide/tpls/clion/CMakeLists.txt.tpl @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.2) project({{project_name}}) -include(CMakeListsLocal.txt) +include(CMakeListsPrivate.txt) % for define in defines: add_definitions(-D{{!define}}) diff --git a/platformio/ide/tpls/clion/CMakeListsLocal.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl similarity index 100% rename from platformio/ide/tpls/clion/CMakeListsLocal.txt.tpl rename to platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl