Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
celllframe-node
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
celllframe-node
Commits
f95c1cdb
Commit
f95c1cdb
authored
3 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugfix-4970' into 'master'
update submodule See merge request
!247
parents
3b74e2dc
d2b8c946
No related branches found
No related tags found
1 merge request
!247
update submodule
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
python-cellframe
+1
-1
1 addition, 1 deletion
python-cellframe
with
3 additions
and
3 deletions
CMakeLists.txt
+
1
−
1
View file @
f95c1cdb
...
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
...
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 4
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 5
1
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 5
2
)
# init CellFrame SDK
# init CellFrame SDK
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
-
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
\"
"
)
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
-
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
\"
"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
44f1ac77
Compare
7e7c6a77
...
44f1ac77
Subproject commit
7e7c6a77ed894ea7b1b859480ab4df4d9bc3d665
Subproject commit
44f1ac77cd56e40f0c82703c64db96f87edd74b3
This diff is collapsed.
Click to expand it.
python-cellframe
@
b333e000
Compare
55f11e36
...
b333e000
Subproject commit
55f11e362073a27247b81bdf912b007fcaf41e5d
Subproject commit
b333e00030825972ffc4ae59e07e7c2f1b58ec15
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment