| 1 |
commit: de6b53e175a9889f62b62375c6d690933ef2bc97 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 27 15:11:28 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 15:12:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6b53e1 |
| 7 |
|
| 8 |
dev-games/ois: refresh patch with upstream(ing) candidate |
| 9 |
|
| 10 |
URL: https://github.com/wgois/OIS/pull/69 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-games/ois/files/ois-1.5-libdir.patch | 32 ++++++++++++++++---------------- |
| 14 |
1 file changed, 16 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-games/ois/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch |
| 17 |
index acd635c550b..f7f3efbc837 100644 |
| 18 |
--- a/dev-games/ois/files/ois-1.5-libdir.patch |
| 19 |
+++ b/dev-games/ois/files/ois-1.5-libdir.patch |
| 20 |
@@ -1,31 +1,31 @@ |
| 21 |
+https://github.com/wgois/OIS/pull/69 |
| 22 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 23 |
-index a5da3b7..90a8b77 100644 |
| 24 |
+index 56b1c49..c4ce5a8 100644 |
| 25 |
--- a/CMakeLists.txt |
| 26 |
+++ b/CMakeLists.txt |
| 27 |
-@@ -210,8 +210,7 @@ if (OIS_BUILD_DEMOS) |
| 28 |
+@@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS) |
| 29 |
|
| 30 |
endif() |
| 31 |
|
| 32 |
-set(LIB_INSTALL_DIR "lib") |
| 33 |
--set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) |
| 34 |
-+set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) |
| 35 |
++if(UNIX) |
| 36 |
++ include(GNUInstallDirs) |
| 37 |
++ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) |
| 38 |
++else() |
| 39 |
++ set(LIB_INSTALL_DIR "lib") |
| 40 |
++endif() |
| 41 |
++ |
| 42 |
+ set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) |
| 43 |
|
| 44 |
- file(GLOB PUBLIC_HEADERS "${CMAKE_SOURCE_DIR}/includes/*.h") |
| 45 |
- |
| 46 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 47 |
-index 90a8b77..3c1fe95 100644 |
| 48 |
---- a/CMakeLists.txt |
| 49 |
-+++ b/CMakeLists.txt |
| 50 |
-@@ -219,9 +219,9 @@ install(FILES ${PUBLIC_HEADERS} |
| 51 |
- ) |
| 52 |
+ file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h") |
| 53 |
+@@ -240,8 +246,8 @@ install(FILES ${PUBLIC_HEADERS} |
| 54 |
|
| 55 |
install(TARGETS OIS |
| 56 |
-- RUNTIME DESTINATION bin |
| 57 |
+ RUNTIME DESTINATION bin |
| 58 |
- LIBRARY DESTINATION lib |
| 59 |
- ARCHIVE DESTINATION lib |
| 60 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 61 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 62 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 63 |
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} |
| 64 |
++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} |
| 65 |
FRAMEWORK DESTINATION Library/Frameworks |
| 66 |
) |
Archives