Skip to content
Snippets Groups Projects
Commit 70b0781e authored by Santiago Ospina De Los Ríos's avatar Santiago Ospina De Los Ríos
Browse files

Rename library name

The multidomain-lib and singledomain-lib are too generic to be set in any system, so this is replaced for something more specific
parent 0c16ea75
No related branches found
No related tags found
1 merge request!49Resolve "Finish installation and usage instruction on the documentation"
Pipeline #33219 failed
...@@ -49,6 +49,8 @@ set(DUNE_COPASI_MD_LIBRARY ${DUNE_COPASI_MD_EXECUTABLE} ...@@ -49,6 +49,8 @@ set(DUNE_COPASI_MD_LIBRARY ${DUNE_COPASI_MD_EXECUTABLE}
# main target # main target
add_library(dune-copasi) add_library(dune-copasi)
set_target_properties(dune-copasi PROPERTIES LIBRARY_OUTPUT_NAME dunecopasi)
set_target_properties(dune-copasi PROPERTIES ARCHIVE_OUTPUT_NAME dunecopasi)
# add dune dependencies to this target # add dune dependencies to this target
dune_target_enable_all_packages(dune-copasi) dune_target_enable_all_packages(dune-copasi)
...@@ -142,5 +144,5 @@ export(EXPORT dune-copasi-targets ...@@ -142,5 +144,5 @@ export(EXPORT dune-copasi-targets
) )
# include tests as a sub project # include tests as a sub project
add_library(dune-copasi:: ALIAS dune-copasi) add_library(dune-copasi::dune-copasi ALIAS dune-copasi)
# add_subdirectory(test) add_subdirectory(test)
# This settings define the installed cmake config file. It adds a minimal setup # This settings define the installed cmake config file. It adds a minimal setup
# for the dune requirements without cluttering the whole project with old CMake # for the dune requirements without cluttering the whole project with old CMake
set_property(GLOBAL PROPERTY DUNE_MODULE_LIBRARIES dune-copasi)
set(DUNE_CUSTOM_PKG_CONFIG_SECTION set(DUNE_CUSTOM_PKG_CONFIG_SECTION
" "
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
...@@ -17,9 +15,6 @@ include(DuneMPI) ...@@ -17,9 +15,6 @@ include(DuneMPI)
set(DUNE_PYTHON_VIRTUALENV_SETUP ${DUNE_PYTHON_VIRTUALENV_SETUP}) set(DUNE_PYTHON_VIRTUALENV_SETUP ${DUNE_PYTHON_VIRTUALENV_SETUP})
set(ProjectName dune-copasi) set(ProjectName dune-copasi)
define_property(GLOBAL PROPERTY DUNE_MODULE_LIBRARIES
BRIEF_DOCS \"List of libraries of the module. DO NOT EDIT!\"
FULL_DOCS \"List of libraries of the module. Used to generate CMake's package configuration files. DO NOT EDIT!\")
find_file(\${ProjectName}_MODULE_DIR dune.module find_file(\${ProjectName}_MODULE_DIR dune.module
HINTS HINTS
...@@ -35,4 +30,8 @@ dune_module_information(\${\${ProjectName}_MODULE_DIR}) ...@@ -35,4 +30,8 @@ dune_module_information(\${\${ProjectName}_MODULE_DIR})
dune_create_dependency_tree() dune_create_dependency_tree()
dune_process_dependency_macros() dune_process_dependency_macros()
unset(ProjectName) unset(ProjectName)
#import the target
get_filename_component(_dir \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
include(\"\${_dir}/dune-copasi-targets.cmake\")
") ")
...@@ -16,6 +16,8 @@ target_link_directories(singldomain-lib PUBLIC ...@@ -16,6 +16,8 @@ target_link_directories(singldomain-lib PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
) )
target_link_libraries(singldomain-lib PRIVATE dune-copasi) target_link_libraries(singldomain-lib PRIVATE dune-copasi)
set_target_properties(singldomain-lib PROPERTIES LIBRARY_OUTPUT_NAME dunecopasisd)
set_target_properties(singldomain-lib PROPERTIES ARCHIVE_OUTPUT_NAME dunecopasisd)
if(DUNE_COPASI_SD_LIBRARY) if(DUNE_COPASI_SD_LIBRARY)
set_target_properties(singldomain-lib PROPERTIES EXCLUDE_FROM_ALL OFF) set_target_properties(singldomain-lib PROPERTIES EXCLUDE_FROM_ALL OFF)
...@@ -44,6 +46,8 @@ target_link_directories(multidomain-lib PUBLIC ...@@ -44,6 +46,8 @@ target_link_directories(multidomain-lib PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
) )
target_link_libraries(multidomain-lib PRIVATE dune-copasi) target_link_libraries(multidomain-lib PRIVATE dune-copasi)
set_target_properties(multidomain-lib PROPERTIES LIBRARY_OUTPUT_NAME dunecopasimd)
set_target_properties(multidomain-lib PROPERTIES ARCHIVE_OUTPUT_NAME dunecopasimd)
if(DUNE_COPASI_MD_LIBRARY) if(DUNE_COPASI_MD_LIBRARY)
set_target_properties(multidomain-lib PROPERTIES EXCLUDE_FROM_ALL OFF) set_target_properties(multidomain-lib PROPERTIES EXCLUDE_FROM_ALL OFF)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment