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
81d3a49c
Commit
81d3a49c
authored
4 years ago
by
Santiago Ospina De Los Ríos
Browse files
Options
Downloads
Patches
Plain Diff
Fix config of dune dependencies
parent
565c577e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!49
Resolve "Finish installation and usage instruction on the documentation"
Pipeline
#33561
failed
4 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/pkg/dune-copasi-config.cmake.in
+22
-11
22 additions, 11 deletions
cmake/pkg/dune-copasi-config.cmake.in
test/CMakeLists.txt
+4
-0
4 additions, 0 deletions
test/CMakeLists.txt
with
26 additions
and
11 deletions
cmake/pkg/dune-copasi-config.cmake.in
+
22
−
11
View file @
81d3a49c
function(swap_args ARG1 ARG2)
set(_tmp ${ARG1})
set(ARG1 ${ARG2})
set(ARG2 ${_tmp})
unset(_tmp)
endfunction()
if(NOT dune-copasi_FOUND)
# Whether this module is installed or not
set(dune-copasi_INSTALLED @MODULE_INSTALLED@)
...
...
@@ -18,10 +11,15 @@ if(NOT dune-copasi_FOUND)
#report other information
set_and_check(dune-copasi_PREFIX "${PACKAGE_PREFIX_DIR}")
set_and_check(dune-copasi_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
set(dune-copasi_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
set(dune-copasi_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
set(dune-copasi_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
set(dune-copasi_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
set(dune-copasi_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
set(dune-copasi_DEPENDS "@dune-copasi_DEPENDS@")
set(dune-copasi_SUGGESTS "@dune-copasi_SUGGESTS@")
set(dune-copasi_MODULE_PATH "@PACKAGE_DUNE_INSTALL_MODULEDIR@")
set(DUNE_PYTHON_VIRTUALENV_SETUP
${
DUNE_PYTHON_VIRTUALENV_SETUP
}
)
set(DUNE_PYTHON_VIRTUALENV_SETUP
@
DUNE_PYTHON_VIRTUALENV_SETUP
@
)
include(CMakeFindDependencyMacro)
...
...
@@ -31,13 +29,25 @@ if(NOT dune-copasi_FOUND)
# make sure to find cmake modules for dune-common
list(APPEND CMAKE_MODULE_PATH "${dune-common_MODULE_PATH}")
include(DuneMacros)
include(CheckCXXFeatures)
include(DuneCxaDemangle)
include(DuneMPI)
# setup other dune dependecies
set(TmpProjectName dune-copasi)
swap_args(ProjectName TmpProjectName)
set(ProjectName dune-copasi)
find_file(dune-copasi_MODULE_DIR dune.module
HINTS
"${dune-copasi_PREFIX}"
"${dune-copasi_PREFIX}/lib/dunecontrol/dune-copasi"
"${dune-copasi_PREFIX}/lib64/dunecontrol/dune-copasi"
REQUIRED
NO_DEFAULT_PATH
)
string(REPLACE dune.module "" dune-copasi_MODULE_DIR ${dune-copasi_MODULE_DIR})
dune_module_information(${dune-copasi_MODULE_DIR})
dune_create_dependency_tree()
dune_process_dependency_macros()
swap_args(ProjectName TmpProjectName)
# make sure to find cmake modules for dune-copasi
list(APPEND CMAKE_MODULE_PATH "${dune-copasi_MODULE_PATH}")
...
...
@@ -54,5 +64,6 @@ if(NOT dune-copasi_FOUND)
get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
include("${_dir}/dune-copasi-targets.cmake")
# export short alias
add_library(dune::copasi ALIAS dune-copasi::dune-copasi)
endif()
\ No newline at end of file
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
+
4
−
0
View file @
81d3a49c
...
...
@@ -162,3 +162,7 @@ if (dune-testtools_FOUND)
set_property
(
TEST
"dune-copasi-md-jacobian_test_NFkappaB"
PROPERTY LABELS unit
)
endif
()
if
(
"
${
CMAKE_SOURCE_DIR
}
"
STREQUAL
"
${
PROJECT_SOURCE_DIR
}
"
)
set_target_properties
(
build_unit_tests build_system_tests PROPERTIES EXCLUDE_FROM_ALL OFF
)
endif
()
\ No newline at end of file
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