Merge pull request #90 from sanekas/fix/incorrect_lib_memory_path

Fix makefile, add CLion service dirs to .gitignore
7 years ago · a4fc173cbf
parent edc093e810 2a98f95df8
commit a4fc173cbf
2 changed files with 10 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
 build/
+cmake-build-debug/
+.idea/
--- a/2
+++ b/2
@ -89,10 +89,10 @@ LIB_API_HEADER_FILES = hal/inc/hal_time.h
 LIB_API_HEADER_FILES += hal/inc/hal_thread.h
 LIB_API_HEADER_FILES += hal/inc/hal_filesystem.h
 LIB_API_HEADER_FILES += hal/inc/tls_config.h
+LIB_API_HEADER_FILES += hal/inc/lib_memory.h
 LIB_API_HEADER_FILES += src/common/inc/libiec61850_common_api.h
 LIB_API_HEADER_FILES += src/common/inc/linked_list.h
 LIB_API_HEADER_FILES += src/common/inc/byte_buffer.h
-LIB_API_HEADER_FILES += src/common/inc/lib_memory.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_client.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_common.h
 LIB_API_HEADER_FILES += src/iec61850/inc/iec61850_server.h