diff options
Diffstat (limited to 'dev-libs/sobjectizer/files')
-rw-r--r-- | dev-libs/sobjectizer/files/cmake-5.7.4.3.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/dev-libs/sobjectizer/files/cmake-5.7.4.3.patch b/dev-libs/sobjectizer/files/cmake-5.7.4.3.patch deleted file mode 100644 index 09fda43..0000000 --- a/dev-libs/sobjectizer/files/cmake-5.7.4.3.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/dev/so_5/CMakeLists.txt b/dev/so_5/CMakeLists.txt -index a8ee686b..cb4c5553 100644 ---- a/dev/so_5/CMakeLists.txt -+++ b/dev/so_5/CMakeLists.txt -@@ -17,6 +17,7 @@ if(NOT SOBJECTIZER_INSTALL) - endif() - - include(cmake/target.cmake) -+include(GNUInstallDirs) - - project(sobjectizer VERSION ${SO_5_VERSION} LANGUAGES CXX) - -@@ -164,14 +165,14 @@ if(SOBJECTIZER_BUILD_STATIC) - endif() - - if(SOBJECTIZER_INSTALL) -- set(SO_5_CMAKE_FILES_DEST "lib/cmake/sobjectizer") -+ set(SO_5_CMAKE_FILES_DEST "${CMAKE_INSTALL_LIBDIR}/cmake/sobjectizer") - - install( - TARGETS ${SO_5_TARGETS_TO_INSTALL} - EXPORT SO_5_ALL_TARGETS -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -- RUNTIME DESTINATION bin -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) - install( - EXPORT SO_5_ALL_TARGETS -@@ -182,7 +183,7 @@ if(SOBJECTIZER_INSTALL) - - if(SOBJECTIZER_BUILD_SHARED) - foreach(__extLibrary ${SO_5_EXT_LIBS}) -- install(FILES ${__extLibrary} DESTINATION lib) -+ install(FILES ${__extLibrary} DESTINATION "${CMAKE_INSTALL_LIBDIR}") - endforeach() - endif() - -@@ -192,7 +193,7 @@ if(SOBJECTIZER_INSTALL) - # Since v.5.7.2.3 install even files from impl subfolders - # because it could be necessary for projects like so5extra. - get_filename_component( DIR ${HEADER_FILE} PATH ) -- install( FILES ${HEADER_FILE} DESTINATION include/so_5/${DIR} ) -+ install( FILES ${HEADER_FILE} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/so_5/${DIR}" ) - endforeach() - - set(SO_5_CONFIG_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/sobjectizer-config-version.cmake") |