Skip to content
Snippets Groups Projects
Commit f0068703 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Merge branch 'feature/cmake' into 'develop'

Feature/cmake

See merge request !31
parents 552163e9 ec4b23b8
No related branches found
No related tags found
1 merge request!31Feature/cmake
...@@ -394,3 +394,17 @@ target_link_libraries( ...@@ -394,3 +394,17 @@ target_link_libraries(
${OPENMP_LINK_FLAGS} ${OPENMP_LINK_FLAGS}
${PUGS_STD_LINK_FLAGS} ${PUGS_STD_LINK_FLAGS}
) )
# ------------------- Installation --------------------
# temporary version workaround
if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
install(TARGETS pugs
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
else()
install(TARGETS pugs PugsMesh PugsUtils PugsLanguage
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
...@@ -11,3 +11,12 @@ add_library( ...@@ -11,3 +11,12 @@ add_library(
# Additional dependencies # Additional dependencies
#add_dependencies(PugsMesh) #add_dependencies(PugsMesh)
# ------------------- Installation --------------------
# temporary version workaround
if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
install(TARGETS PugsLanguage
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
...@@ -15,3 +15,12 @@ include_directories(${PUGS_BINARY_DIR}/src/utils) ...@@ -15,3 +15,12 @@ include_directories(${PUGS_BINARY_DIR}/src/utils)
# Additional dependencies # Additional dependencies
#add_dependencies(PugsMesh) #add_dependencies(PugsMesh)
# ------------------- Installation --------------------
# temporary version workaround
if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
install(TARGETS PugsMesh
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
...@@ -107,3 +107,12 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pugs_config.hpp.in" ...@@ -107,3 +107,12 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pugs_config.hpp.in"
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pugs_build_info.hpp.in" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pugs_build_info.hpp.in"
"${CMAKE_CURRENT_BINARY_DIR}/pugs_build_info.hpp" "${CMAKE_CURRENT_BINARY_DIR}/pugs_build_info.hpp"
@ONLY) @ONLY)
# ------------------- Installation --------------------
# temporary version workaround
if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
install(TARGETS PugsUtils
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
endif()
...@@ -25,6 +25,8 @@ add_executable (mpi_unit_tests ...@@ -25,6 +25,8 @@ add_executable (mpi_unit_tests
target_link_libraries (unit_tests target_link_libraries (unit_tests
PugsUtils PugsUtils
kokkos kokkos
${PARMETIS_LIBRARIES}
${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
Catch2 Catch2
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment