diff options
| author |   Sam James <sam@gentoo.org> | 2021-02-27 15:11:28 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-02-27 15:12:39 +0000 |
| commit | de6b53e175a9889f62b62375c6d690933ef2bc97 (patch) | |
| tree | 1ebf6d6cb12cb5ccde29ccdaa69b215949d399ce /dev-games/ois | |
| parent | app-office/mdbtools: (security) bump to 0.9.2 (diff) | |
| download | gentoo-de6b53e175a9889f62b62375c6d690933ef2bc97.tar.gz gentoo-de6b53e175a9889f62b62375c6d690933ef2bc97.tar.bz2 gentoo-de6b53e175a9889f62b62375c6d690933ef2bc97.zip | |
dev-games/ois: refresh patch with upstream(ing) candidate
URL: https://github.com/wgois/OIS/pull/69
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-games/ois')
| -rw-r--r-- | dev-games/ois/files/ois-1.5-libdir.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dev-games/ois/files/ois-1.5-libdir.patch b/dev-games/ois/files/ois-1.5-libdir.patch index acd635c550b9..f7f3efbc8370 100644 --- a/dev-games/ois/files/ois-1.5-libdir.patch +++ b/dev-games/ois/files/ois-1.5-libdir.patch @@ -1,31 +1,31 @@ +https://github.com/wgois/OIS/pull/69 diff --git a/CMakeLists.txt b/CMakeLists.txt -index a5da3b7..90a8b77 100644 +index 56b1c49..c4ce5a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -210,8 +210,7 @@ if (OIS_BUILD_DEMOS) +@@ -229,7 +229,13 @@ if (OIS_BUILD_DEMOS) endif() -set(LIB_INSTALL_DIR "lib") --set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) -+set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) ++if(UNIX) ++ include(GNUInstallDirs) ++ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) ++else() ++ set(LIB_INSTALL_DIR "lib") ++endif() ++ + set(OIS_LIB_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) - file(GLOB PUBLIC_HEADERS "${CMAKE_SOURCE_DIR}/includes/*.h") - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90a8b77..3c1fe95 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,9 +219,9 @@ install(FILES ${PUBLIC_HEADERS} - ) + file(GLOB PUBLIC_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/includes/*.h") +@@ -240,8 +246,8 @@ install(FILES ${PUBLIC_HEADERS} install(TARGETS OIS -- RUNTIME DESTINATION bin + RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} FRAMEWORK DESTINATION Library/Frameworks ) |