File tree Expand file tree Collapse file tree 3 files changed +12
-5
lines changed
Expand file tree Collapse file tree 3 files changed +12
-5
lines changed Original file line number Diff line number Diff line change 11< ?xml version=" 1.0" encoding=" UTF-8" ?>
2- < xmi: XMI xmi:version =" 2.0" xmlns:xmi=" http://www.omg.org/XMI" / >
2+ < architecture:ArchitectureDescription xmi:version =" 2.0" xmlns:xmi=" http://www.omg.org/XMI" xmlns:architecture= " http://www.eclipse.org/papyrus/infra/core/architecture " contextId= " org.eclipse.papyrus.uml.architecture.Profile " / >
Original file line number Diff line number Diff line change @@ -29,10 +29,11 @@ set(H5CPP_LINKS Boost::filesystem ${MPI_CXX_LIBRARIES})
2929#
3030# remove the absolute path from the library name
3131#
32+ set (H5CPP_INTERFACE_LIBS)
33+ set (H5CPP_PRIVATE_LIBS ${HDF5_LIBRARIES} )
3234foreach (HDF5_LIBRARY ${HDF5_LIBRARIES} )
3335 get_filename_component (LIB_NAME ${HDF5_LIBRARY} NAME )
34- get_filename_component (LIB_PATH ${HDF5_LIBRARY} DIRECTORY )
35- list (APPEND H5CPP_LINKS ${LIB_NAME} )
36+ list (APPEND H5CPP_INTERFACE_LIBS ${LIB_NAME} )
3637endforeach ()
3738
3839
@@ -62,7 +63,8 @@ enable_coverage(h5cpp_shared)
6263
6364target_link_libraries (h5cpp_shared
6465 PUBLIC ${H5CPP_LINKS}
65- PRIVATE ${COVERAGE_LIBRARIES} )
66+ PRIVATE ${COVERAGE_LIBRARIES} ${H5CPP_PRIVATE_LIBS}
67+ INTERFACE ${H5CPP_INTERFACE_LIBS} )
6668
6769include (GNUInstallDirs) #Required for CMAKE_INSTALL_XXX
6870
Original file line number Diff line number Diff line change @@ -5,7 +5,12 @@ if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
55 add_definitions (/wd4251 /wd4275)
66endif ()
77
8- include_directories (${PROJECT_SOURCE_DIR} /src)
8+ include_directories (${PROJECT_SOURCE_DIR} /src ${HDF5_INCLUDE_DIRS} )
9+ foreach (HDF5_LIB ${HDF5_LIBRARIES} )
10+ get_filename_component (LIB_PATH ${HDF5_LIB} DIRECTORY )
11+ link_directories (${LIB_PATH} )
12+ endforeach ()
13+
914
1015set (dir ${CMAKE_CURRENT_SOURCE_DIR} )
1116
You can’t perform that action at this time.
0 commit comments