rttr/cmake_install_dir.patch
Marcus Meissner aede2f5189 Accepting request 666367 from home:weatherhead99
- fix incorrect permissions in -devel package installed files 
- update package to new version (0.9.6)
- update patch for buildsystem installation locations
- patch for forcing c++11 mode on gcc4.8 (for openSUSE_Leap_42.3)
- initial package from upstream source (0.9.5)
- patch for correcting buildsystem installation locations

OBS-URL: https://build.opensuse.org/request/show/666367
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/rttr?expand=0&rev=1
2019-01-21 07:09:39 +00:00

33 lines
1.5 KiB
Diff

Index: rttr-0.9.6/CMake/config.cmake
===================================================================
--- rttr-0.9.6.orig/CMake/config.cmake
+++ rttr-0.9.6/CMake/config.cmake
@@ -69,7 +69,7 @@ if(UNIX)
set(RTTR_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
- set(RTTR_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/rttr/cmake")
+ set(RTTR_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/rttr/")
set(RTTR_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/rttr")
elseif(WIN32)
Index: rttr-0.9.6/doc/CMakeLists.txt
===================================================================
--- rttr-0.9.6.orig/doc/CMakeLists.txt
+++ rttr-0.9.6/doc/CMakeLists.txt
@@ -33,12 +33,12 @@ set(DOXYGEN_PROJECT_NAME "${PROJECT
set(DOXYGEN_INPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/rttr \\
${CMAKE_CURRENT_SOURCE_DIR}" )
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/doc")
-set(DOXYGEN_DOC_INSTALL_DIR "doc")
+set(DOXYGEN_DOC_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/packages/rttr")
set(DOXYGEN_CONFIG_FILE_IN "DoxyFile.cfg.in")
set(DOXYGEN_LAYOUT_FILE_IN "doxygen-customization/layout/DoxygenLayout.xml.in")
set(DOXYGEN_EXCLUDE "")
set(DOXYGEN_STRIP_FROM_PATH "${CMAKE_SOURCE_DIR}/src/rttr")
-set(DOXYGEN_CUSTOM_HTML_DIR "rttr-${RTTR_VERSION_MAJOR}-${RTTR_VERSION_MINOR}-${RTTR_VERSION_PATCH}")
+set(DOXYGEN_CUSTOM_HTML_DIR "html")
set(DOXYGEN_PREDEFINED "DOXYGEN \\
RTTR_INLINE= \\
RTTR_FORCE_INLINE= \\