-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
devil, fix installation paths, fix building with newer gcc versions
- Loading branch information
Showing
2 changed files
with
88 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
From 0d421d3ff0444817e24803a50cddb5f07d5dfcd3 Mon Sep 17 00:00:00 2001 | ||
From: Begasus <begasus@gmail.com> | ||
Date: Mon, 3 Apr 2023 19:13:04 +0200 | ||
Subject: Fix installation paths | ||
|
||
|
||
diff --git a/src-IL/CMakeLists.txt b/src-IL/CMakeLists.txt | ||
index 02e4f03..7a6e62f 100644 | ||
--- a/src-IL/CMakeLists.txt | ||
+++ b/src-IL/CMakeLists.txt | ||
@@ -248,14 +248,14 @@ configure_file( pkgconfig/IL.pc.cmake.in | ||
|
||
# Installation | ||
install (TARGETS IL | ||
- 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 (FILES ../include/IL/il.h DESTINATION include/IL) | ||
+install (FILES ../include/IL/il.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL) | ||
|
||
install(FILES | ||
${CMAKE_CURRENT_BINARY_DIR}/IL.pc | ||
- DESTINATION lib/pkgconfig | ||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig | ||
) | ||
|
||
diff --git a/src-ILU/CMakeLists.txt b/src-ILU/CMakeLists.txt | ||
index 17a3afe..3975b0e 100644 | ||
--- a/src-ILU/CMakeLists.txt | ||
+++ b/src-ILU/CMakeLists.txt | ||
@@ -74,14 +74,14 @@ endif(UNICODE) | ||
|
||
# Installation | ||
install (TARGETS ILU | ||
- 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 (FILES ../include/IL/ilu.h DESTINATION include/IL) | ||
+install (FILES ../include/IL/ilu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL) | ||
|
||
install(FILES | ||
${CMAKE_CURRENT_BINARY_DIR}/ILU.pc | ||
- DESTINATION lib/pkgconfig | ||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig | ||
) | ||
|
||
diff --git a/src-ILUT/CMakeLists.txt b/src-ILUT/CMakeLists.txt | ||
index 21470cb..94e5993 100644 | ||
--- a/src-ILUT/CMakeLists.txt | ||
+++ b/src-ILUT/CMakeLists.txt | ||
@@ -72,14 +72,14 @@ endif(UNICODE) | ||
|
||
# Installation | ||
install (TARGETS ILUT | ||
- 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 (FILES ../include/IL/ilut.h DESTINATION include/IL) | ||
+install (FILES ../include/IL/ilut.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL) | ||
|
||
install(FILES | ||
${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc | ||
- DESTINATION lib/pkgconfig | ||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig | ||
) | ||
|
||
-- | ||
2.37.3 | ||
|