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
29e3155c
Commit
29e3155c
authored
3 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Patches
Plain Diff
[!] Release candidate 4.4
parent
ea937f18
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!226
Release 4.4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+7
-5
7 additions, 5 deletions
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
with
8 additions
and
6 deletions
CMakeLists.txt
+
7
−
5
View file @
29e3155c
...
@@ -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 4
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR
3
)
SET
(
CPACK_PACKAGE_VERSION_MINOR
4
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
46
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
0
)
# 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
}
\"
"
)
...
@@ -41,9 +41,9 @@ add_subdirectory(cellframe-sdk)
...
@@ -41,9 +41,9 @@ add_subdirectory(cellframe-sdk)
if
(
UNIX
)
if
(
UNIX
)
if
(
DARWIN
)
if
(
DARWIN
)
SET
(
CMAKE_INSTALL_PREFIX
"/
usr/local/CellframeNode
"
)
SET
(
CMAKE_INSTALL_PREFIX
"/
Applications/Cellframe.app/Contents/Resources
"
)
SET
(
CPACK_INSTALL_PREFIX
"/
usr/local/CellframeNode
"
)
SET
(
CPACK_INSTALL_PREFIX
"/
Applications/Cellframe.app/Contents/Resources
"
)
SET
(
DESTDIR
"/
usr/local/CellframeNode
"
)
SET
(
DESTDIR
"/
Applications/Cellframe.app/Contents/Resources
"
)
else
()
else
()
SET
(
CMAKE_INSTALL_PREFIX
"/opt/
${
PROJECT_NAME
}
"
)
SET
(
CMAKE_INSTALL_PREFIX
"/opt/
${
PROJECT_NAME
}
"
)
SET
(
CPACK_INSTALL_PREFIX
"/opt/
${
PROJECT_NAME
}
"
)
SET
(
CPACK_INSTALL_PREFIX
"/opt/
${
PROJECT_NAME
}
"
)
...
@@ -242,6 +242,8 @@ endif()
...
@@ -242,6 +242,8 @@ endif()
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
if
(
LINUX
)
if
(
LINUX
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist.linux/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist.linux/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
elseif
(
DARWIN
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist.darwin/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
elseif
(
BSD
)
elseif
(
BSD
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist.bsd/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/dist.bsd/ DESTINATION
${
CMAKE_INSTALL_PREFIX
}
FILES_MATCHING PATTERN
"*"
PATTERN
"*"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
ca89718a
Compare
01bcfa78
...
ca89718a
Subproject commit
01bcfa7825e605f04dcfb1317482440e3dd99d43
Subproject commit
ca89718a48f90b97eb98fe6a96091aab867e0f44
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