From 451708a3bafc4af9ebf88f1fd90d0d55c6b05543 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Tue, 12 Feb 2019 22:00:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt             |  3 +++
 cmake/cmlib                |  2 +-
 src/libcmex/CMakeLists.txt | 28 ++++++++++++++++++++++++++++
 src/libcmex/cmex.cpp       |  6 ++++++
 src/libcmex/cmex.hpp       |  9 +++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/libcmex/CMakeLists.txt
 create mode 100644 src/libcmex/cmex.cpp
 create mode 100644 src/libcmex/cmex.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ce326d..ea79748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,3 +32,6 @@ find_package(Qt5 COMPONENTS Core Network Gui Widgets DBus Concurrent Sql REQUIRE
 # Автоматически генерируемый заголовочный файл
 cmlib_config_hpp_generate()
 
+# Библиотека
+add_subdirectory(src/libcmex)
+
diff --git a/cmake/cmlib b/cmake/cmlib
index 6e5e08a..405cced 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit 6e5e08aac02b2b9dce71265e9aff85e758cd3648
+Subproject commit 405cced4a59588719e7cb3ef3f4c778326223a9d
diff --git a/src/libcmex/CMakeLists.txt b/src/libcmex/CMakeLists.txt
new file mode 100644
index 0000000..bd57468
--- /dev/null
+++ b/src/libcmex/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Название основной цели и имя библиотеки в текущем каталоге
+set(current_target cmex)
+
+# Список файлов исходных текстов
+set(current_target_sources
+  cmex.cpp
+)
+
+# Список заголовочных файлов (используется для установки)
+set(current_target_headers
+  cmex.hpp
+)
+
+add_common_library(${current_target} ${current_target_sources})
+common_target_properties(${current_target})
+
+# Цель, используемая только для установки заголовочных файлов, без компиляции проекта
+add_custom_target(${current_target}-install-headers
+  COMMAND "${CMAKE_COMMAND}"
+  -DCMAKE_INSTALL_COMPONENT=headers -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
+  )
+
+# Правила для установки
+install(TARGETS ${current_target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS ${current_target}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES ${CMAKE_BINARY_DIR}/include/config.hpp ${current_target_headers}
+  COMPONENT headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${current_target})
+
diff --git a/src/libcmex/cmex.cpp b/src/libcmex/cmex.cpp
new file mode 100644
index 0000000..d90d4fd
--- /dev/null
+++ b/src/libcmex/cmex.cpp
@@ -0,0 +1,6 @@
+#include "cmex.hpp"
+
+int32_t cmex_init(int32_t i = 0) {
+	return i;
+}
+
diff --git a/src/libcmex/cmex.hpp b/src/libcmex/cmex.hpp
new file mode 100644
index 0000000..69cd0c7
--- /dev/null
+++ b/src/libcmex/cmex.hpp
@@ -0,0 +1,9 @@
+#ifndef LIBCMEX_CMEX_HPP_
+#define LIBCMEX_CMEX_HPP_
+
+#include <stdint.h>
+
+int32_t cmex_init(int32_t i);
+
+#endif // LIBCMEX_CMEX_HPP_
+