logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch (4002B)

    

  1. From c43cc918c3e79e324f11ca47e95bfe36e9e0dd15 Mon Sep 17 00:00:00 2001

  2. From: Jonathan Scruggs <j.scruggs@gmail.com>

  3. Date: Sun, 14 Jan 2018 19:59:31 +0000

  4. Subject: [PATCH] Add GNUInstallDirs variables and fix install location for

  5.  cmake files

  6. 

  7. GNUInstallDirs is supported on all platforms and variables are set

  8. to the standard GNU locations.

  9. 

  10. This patch corrects the location where the CMake files are

  11. installed.

  12. 

  13. Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>

  14. ---

  15.  CMakeLists.txt                     | 9 +++++----

  16.  docs/CMakeLists.txt                | 4 ++--

  17.  export/pkgconfig/OpenColorIO.pc.in | 6 ++----

  18.  3 files changed, 9 insertions(+), 10 deletions(-)

  19. 

  20. diff --git a/CMakeLists.txt b/CMakeLists.txt

  21. index b05c7e4..452fa1e 100644

  22. --- a/CMakeLists.txt

  23. +++ b/CMakeLists.txt

  24. @@ -59,6 +59,7 @@ endif()

  25.  include(ParseArguments)

  26.  include(OCIOMacros)

  27.  include(ExternalProject)

  28. +include(GNUInstallDirs)

  29.  

  30.  enable_language(CXX)

  31.  

  32. @@ -531,7 +532,7 @@ endif()

  33.  configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in

  34.      ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)

  35.  

  36. -INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)

  37. +INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)

  38.  

  39.  ###############################################################################

  40.  ### CPACK ###

  41. @@ -596,7 +597,7 @@ if(TARGET OpenColorIO_STATIC)

  42.          set(OCIO_STATIC_COMPILE_DEFINITIONS )

  43.      endif()

  44.  endif()

  45. -install(EXPORT OpenColorIO DESTINATION cmake)

  46. +install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)

  47.  file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"

  48.      "

  49.      get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)

  50. @@ -608,7 +609,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"

  51.      

  52.      ## targets libraries + associated definitions

  53.      if(NOT TARGET OpenColorIO)

  54. -        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target

  55. +        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target

  56.          if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)

  57.              message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")

  58.              set(OpenColorIO_LIBRARY         OpenColorIO)

  59. @@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"

  60.      message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})

  61.      "

  62.  )

  63. -install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)

  64. +install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)

  65. diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt

  66. index 3fd0299..a822a19 100644

  67. --- a/docs/CMakeLists.txt

  68. +++ b/docs/CMakeLists.txt

  69. @@ -138,7 +138,7 @@ add_custom_target(doc ALL

  70.  add_dependencies(doc Sphinx) 

  71.  

  72.  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/

  73. -        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html

  74. +        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html

  75.          PATTERN .* EXCLUDE

  76.  )

  77.  

  78. @@ -166,6 +166,6 @@ if(PDFLATEX_COMPILER)

  79.      add_dependencies(pdf latex)

  80.      

  81.      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf

  82. -            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)

  83. +            DESTINATION ${CMAKE_INSTALL_DOCDIR})

  84.      

  85.  endif()

  86. diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in

  87. index 81ab4ce3..c4553a4f 100644

  88. --- a/export/pkgconfig/OpenColorIO.pc.in

  89. +++ b/export/pkgconfig/OpenColorIO.pc.in

  90. @@ -1,7 +1,5 @@

  91. -prefix=@CMAKE_INSTALL_PREFIX@

  92. -exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@

  93. -includedir=${prefix}/include

  94. -libdir=${exec_prefix}/lib@LIB_SUFFIX@

  95. +libdir=@CMAKE_INSTALL_FULL_LIBDIR@

  96. +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

  97.  

  98.  Name: OpenColorIO

  99.  Description: A color management framework for visual effects and animation

  100. -- 

  101. 2.15.1

  102.