patch-CMakeLists_txt 1.1 KB

123456789101112131415161718192021222324
  1. $OpenBSD: patch-CMakeLists_txt,v 1.1 2017/05/25 11:26:15 espie Exp $
  2. fixes warnings under clang... we're patching so patch man as well
  3. Index: CMakeLists.txt
  4. --- CMakeLists.txt.orig
  5. +++ CMakeLists.txt
  6. @@ -75,6 +75,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX
  7. # APPLECLANG_VERSION_STRING, otherwise for generic clang set
  8. # CLANG_VERSION_STRING.
  9. set (CMAKE_COMPILER_IS_CLANG 1)
  10. + add_definitions("-Wno-expansion-to-defined")
  11. EXECUTE_PROCESS( COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE clang_full_version_string )
  12. if (clang_full_version_string MATCHES "Apple")
  13. set (CMAKE_CXX_COMPILER_ID "AppleClang")
  14. @@ -322,7 +323,7 @@ if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
  15. set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
  16. set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
  17. set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
  18. - set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
  19. + set (DEFAULT_MAN_INSTALL_DIR "man/man1")
  20. set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
  21. else ()
  22. # Here is the "self-contained install tree" case: the expectation here is