[segyio] 305/376: Use GNUInstallDirs

Jørgen Kvalsvik jokva-guest at moszumanska.debian.org
Wed Sep 20 08:04:49 UTC 2017


This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 363231677f960e31bf8af25178756a7bff3afdfd
Author: Jørgen Kvalsvik <jokva at statoil.com>
Date:   Fri Jun 16 15:06:09 2017 +0200

    Use GNUInstallDirs
---
 CMakeLists.txt     | 2 ++
 lib/CMakeLists.txt | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d9b402..6db71b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.11)
 project(segyio)
 
+include(GNUInstallDirs)
+
 set(segyio_MAJOR 1)
 set(segyio_MINOR 1)
 set(segyio_PATCH 0)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 281cddb..0dbaf3c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -56,9 +56,9 @@ endif ()
 #
 install(TARGETS segyio-static segyio-shared
         EXPORT segyio
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
-        RUNTIME DESTINATION bin)
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(DIRECTORY include/ DESTINATION include)
 install(EXPORT segyio DESTINATION share/segyio/cmake FILE segyio-config.cmake)
 export(TARGETS segyio-static segyio-shared FILE segyio-config.cmake)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git



More information about the debian-science-commits mailing list