Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dune-copasi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
COPASI
dune-copasi
Commits
e7030782
Commit
e7030782
authored
4 years ago
by
Santiago Ospina De Los Ríos
Browse files
Options
Downloads
Patches
Plain Diff
Remove cpack patch
parent
6e2b615f
No related branches found
No related tags found
1 merge request
!49
Resolve "Finish installation and usage instruction on the documentation"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.ci/dune-common.patch
+0
-13
0 additions, 13 deletions
.ci/dune-common.patch
.ci/setup_static_deps
+7
-2
7 additions, 2 deletions
.ci/setup_static_deps
with
7 additions
and
15 deletions
.ci/dune-common.patch
+
0
−
13
View file @
e7030782
...
...
@@ -10,16 +10,3 @@ index 40004d3c..94a2d7ac 100644
make_array.hh
memory.hh
optional.hh
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 1c9b0412..778c9a92 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -977,8 +977,6 @@
endif()
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
endif()
- include(CPack)
-
feature_summary(WHAT ALL)
# check if CXX flag overloading has been enabled
This diff is collapsed.
Click to expand it.
.ci/setup_static_deps
+
7
−
2
View file @
e7030782
...
...
@@ -65,8 +65,13 @@ CMAKE_FLAGS+=" -Dfmt_ROOT='"${INSTALL_PREFIX}"' "
CMAKE_FLAGS+
=
" -DCMAKE_DISABLE_FIND_PACKAGE_QuadMath=TRUE"
CMAKE_FLAGS+
=
" -DDUNE_USE_ONLY_STATIC_LIBS=ON -DF77=true"
export
CMAKE_FLAGS
if
[[
-z
$CMAKE_PREFIX_PATH
]]
;
then
CMAKE_PREFIX_PATH
=
${
INSTALL_PREFIX
}
else
CMAKE_PREFIX_PATH+
=
";
${
INSTALL_PREFIX
}
"
fi
echo
"path '
${
INSTALL_PREFIX
}
' must be include into the CMAKE_PREFIX_PATH"
export
CMAKE_FLAGS
export
CMAKE_PREFIX_PATH
trap
cleanup EXIT
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