From ec4b23b8da8c1a84797c1fb9bb3653a6ffa66674 Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Tue, 25 Feb 2020 23:26:48 +0100 Subject: [PATCH] Fix install instructions for CMake < 3.13 --- CMakeLists.txt | 19 ++++++++++++++----- src/language/CMakeLists.txt | 9 +++++++++ src/mesh/CMakeLists.txt | 9 +++++++++ src/utils/CMakeLists.txt | 9 +++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7ab52856..62e336341 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,9 +393,18 @@ target_link_libraries( ${KOKKOS_CXX_FLAGS} ${OPENMP_LINK_FLAGS} ${PUGS_STD_LINK_FLAGS} -) + ) -install(TARGETS pugs PugsMesh PugsUtils PugsLanguage - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) +# ------------------- 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() diff --git a/src/language/CMakeLists.txt b/src/language/CMakeLists.txt index 2a9e7547f..2c7d8dd1f 100644 --- a/src/language/CMakeLists.txt +++ b/src/language/CMakeLists.txt @@ -11,3 +11,12 @@ add_library( # Additional dependencies #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() diff --git a/src/mesh/CMakeLists.txt b/src/mesh/CMakeLists.txt index 117cdac4e..ec94fd4b7 100644 --- a/src/mesh/CMakeLists.txt +++ b/src/mesh/CMakeLists.txt @@ -15,3 +15,12 @@ include_directories(${PUGS_BINARY_DIR}/src/utils) # Additional dependencies #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() diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 59def1c2d..df37bba9e 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -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" "${CMAKE_CURRENT_BINARY_DIR}/pugs_build_info.hpp" @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() -- GitLab