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
14
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
1a379fac
Commit
1a379fac
authored
4 years ago
by
Roman Khlopkov
🔜
Browse files
Options
Downloads
Plain Diff
Merge branch 'features-2844' of gitlab.demlabs.net:cellframe/cellframe-node into features-2844
parents
05cb3897
ee48e3dc
No related branches found
No related tags found
1 merge request
!139
features-2844
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
python-cellframe
+1
-1
1 addition, 1 deletion
python-cellframe
with
4 additions
and
4 deletions
CMakeLists.txt
+
2
−
2
View file @
1a379fac
...
@@ -7,8 +7,8 @@ set(CMAKE_C_STANDARD 11)
...
@@ -7,8 +7,8 @@ set(CMAKE_C_STANDARD 11)
# Predefine project
# Predefine project
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 3
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 3
)
SET
(
CPACK_PACKAGE_VERSION_MINOR
3
)
SET
(
CPACK_PACKAGE_VERSION_MINOR
4
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
9
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
1
)
# init CellFrame SDK
# init CellFrame SDK
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
\"
"
)
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
\"
"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
737074e2
Compare
7a9f4aee
...
737074e2
Subproject commit 7
a9f4aee86ee45995a0b33425f2faf531f5393a4
Subproject commit 7
37074e29c23a31c27db397589c2339a68c15af0
This diff is collapsed.
Click to expand it.
python-cellframe
@
ce2cc96f
Compare
fbb50e65
...
ce2cc96f
Subproject commit
fbb50e65fec326cd6ea2b47ebebbe5aad8feba39
Subproject commit
ce2cc96fe1b6405dada650bb0a992d58ee305a5e
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