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
17
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
83163b97
Commit
83163b97
authored
3 years ago
by
Roman Khlopkov
🔜
Committed by
dmitriy.gerasimov
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
hotfix-5037
parent
0e1c80c6
No related branches found
No related tags found
1 merge request
!249
hotfix-5037
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-2
3 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
5 additions
and
4 deletions
CMakeLists.txt
+
3
−
2
View file @
83163b97
...
@@ -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
3
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 5
4
)
# 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
}
\"
"
)
...
@@ -38,11 +38,12 @@ elseif(LINUX)
...
@@ -38,11 +38,12 @@ elseif(LINUX)
set
(
CELLFRAME_MODULES
"core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn"
)
set
(
CELLFRAME_MODULES
"core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn"
)
endif
()
endif
()
add_subdirectory
(
cellframe-sdk
)
if
(
CELLFRAME_MODULES MATCHES
"modules-dynamic"
)
if
(
CELLFRAME_MODULES MATCHES
"modules-dynamic"
)
add_definitions
(
"-DDAP_MODULES_DYNAMIC"
)
add_definitions
(
"-DDAP_MODULES_DYNAMIC"
)
endif
()
endif
()
add_subdirectory
(
cellframe-sdk
)
if
(
UNIX
)
if
(
UNIX
)
if
(
DARWIN
)
if
(
DARWIN
)
SET
(
CMAKE_INSTALL_PREFIX
"
${
USERDIR_PATH
}
/Applications/Cellframe.app"
)
SET
(
CMAKE_INSTALL_PREFIX
"
${
USERDIR_PATH
}
/Applications/Cellframe.app"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
4a6c93e4
Compare
971a3932
...
4a6c93e4
Subproject commit
971a39325decfe6bd90bc1cdea5228ce76006355
Subproject commit
4a6c93e47f902eaf02e5ab30e6e56a988fb17080
This diff is collapsed.
Click to expand it.
python-cellframe
@
0aac23e3
Compare
b333e000
...
0aac23e3
Subproject commit
b333e00030825972ffc4ae59e07e7c2f1b5
8ec
15
Subproject commit
0aac23e31253e74c26c689c60261171f2f387
8ec
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