From 3cf5cc69f4ec385f0b795dc4815f0ba150e5d206 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Wed, 13 May 2020 11:19:59 +0300
Subject: [PATCH] [-] Sub libdap-plugins-python
---
.gitmodules | 8 --------
CMakeLists.txt | 3 +--
libdap-plugins-python | 1 -
python-cellframe | 2 +-
4 files changed, 2 insertions(+), 12 deletions(-)
delete mode 160000 libdap-plugins-python
diff --git a/.gitmodules b/.gitmodules
index 584e57a2d..dcac5fba3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
path = test/libdap-test
url = ../libdap-test.git
branch = master
-[submodule "libdap-plugins-python"]
- path = libdap-plugins-python
- url = ../libdap-plugins-python.git
- branch = master
[submodule "python-cellframe"]
path = python-cellframe
url = ../python-cellframe.git
@@ -14,7 +10,3 @@
path = cellframe-sdk
url = ../cellframe-sdk.git
branch = master
-[submodule "cellframe-sdk-python"]
- path = cellframe-sdk-python
- url = ../cellframe-sdk-python.git
- branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4888ea788..57de0bcce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 3)
SET( CPACK_PACKAGE_VERSION_MINOR 2)
-SET( CPACK_PACKAGE_VERSION_PATCH 16)
+SET( CPACK_PACKAGE_VERSION_PATCH 17)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
@@ -132,7 +132,6 @@ if(UNIX AND NOT WIN32)
include_directories(${PYTHON_INCLUDE_DIR} include/)
add_subdirectory(python-cellframe)
- add_subdirectory(libdap-plugins-python)
set(NODE_LIBRARIES ${NODE_LIBRARIES} ${PYTHON_LIBRARIES} dap_plugins_python)
endif()
diff --git a/libdap-plugins-python b/libdap-plugins-python
deleted file mode 160000
index 275167bdc..000000000
--- a/libdap-plugins-python
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 275167bdc1343765c49ca8b0eb796132d3e4cb1b
diff --git a/python-cellframe b/python-cellframe
index 1307c3fb4..fbb50e65f 160000
--- a/python-cellframe
+++ b/python-cellframe
@@ -1 +1 @@
-Subproject commit 1307c3fb4e2ff23ccde8e38d85ef6274a9315016
+Subproject commit fbb50e65fec326cd6ea2b47ebebbe5aad8feba39
--
GitLab