From cd2e8440661bdfd30c256be685eaa986a689060e Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Wed, 5 Jul 2023 12:52:56 +0200 Subject: [PATCH] Use the installation directories provided by cmake Some systems will define the library path as lib64. Also update other install commands to use the values discovered by the GNUInstallDirs module. --- include/CMakeLists.txt | 4 ++-- src/emu/CMakeLists.txt | 4 ++-- src/rt/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 313f6db..958e128 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,6 +1,6 @@ -# Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC) +# Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC) # SPDX-License-Identifier: GPL-3.0-or-later include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -install(FILES ovni.h DESTINATION include) +install(FILES ovni.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/src/emu/CMakeLists.txt b/src/emu/CMakeLists.txt index d720290..86ef689 100644 --- a/src/emu/CMakeLists.txt +++ b/src/emu/CMakeLists.txt @@ -79,10 +79,10 @@ if(USE_MPI) find_package(MPI REQUIRED) add_executable(ovnisync ovnisync.c) target_link_libraries(ovnisync m MPI::MPI_C) - install(TARGETS ovnisync RUNTIME DESTINATION bin) + install(TARGETS ovnisync RUNTIME) else() message(STATUS "Disabling ovnisync as MPI is disabled") endif() -install(TARGETS ovniemu ovnidump ovnisort ovnitop RUNTIME DESTINATION bin) +install(TARGETS ovniemu ovnidump ovnisort ovnitop RUNTIME) install(FILES ovnitop.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") diff --git a/src/rt/CMakeLists.txt b/src/rt/CMakeLists.txt index 367cd2c..d916de0 100644 --- a/src/rt/CMakeLists.txt +++ b/src/rt/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(ovni-static STATIC ovni.c) target_link_libraries(ovni-static parson-static common-static) target_include_directories(ovni-static PUBLIC "${CMAKE_SOURCE_DIR}/include") -install(TARGETS ovni LIBRARY DESTINATION lib) +install(TARGETS ovni LIBRARY)