enblend-4.2-doc-install-dir-fix.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. * Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo
  2. * Install html files in html subdir of doc dir
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -11,9 +11,6 @@
  6. set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
  7. project(enblend)
  8. -IF(NOT MSVC)
  9. - SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
  10. -ENDIF(NOT MSVC)
  11. # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
  12. # is checked
  13. # For now, reuse the hugin modules directory
  14. @@ -130,7 +127,6 @@
  15. ENDIF()
  16. IF(CMAKE_COMPILER_IS_GNUCXX)
  17. - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall")
  18. IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
  19. ## Add needed Compiler and Linker flags for OSX
  20. SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress")
  21. @@ -154,20 +150,6 @@
  22. SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
  23. ENDIF(CMAKE_CL_64)
  24. - # compile everything for the static C runtime
  25. - FOREACH(TYPE C CXX)
  26. - # makefiles use blank configuration
  27. - FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO")
  28. - #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
  29. - SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}")
  30. - # fix up static libc flags
  31. - STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}")
  32. - # *FORCE* to override whats already placed into the cache
  33. - SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING
  34. - "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE)
  35. - #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
  36. - ENDFOREACH(CFG)
  37. - ENDFOREACH(TYPE)
  38. # link only with the static C runtime !! THIS IS A MUST !!
  39. SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
  40. # ensure that the flags are not duplicated on subsequent runs
  41. --- a/doc/CMakeLists.txt
  42. +++ b/doc/CMakeLists.txt
  43. @@ -406,7 +406,7 @@
  44. "${CMAKE_BINARY_DIR}/doc/enfuse.html"
  45. ${ENBLEND_PNGFILES}
  46. ${ENFUSE_PNGFILES}
  47. - DESTINATION ${DocumentsDirectory}
  48. + DESTINATION ${DocumentsDirectory}/html
  49. )
  50. endif()
  51. --- a/src/CMakeLists.txt
  52. +++ b/src/CMakeLists.txt
  53. @@ -102,7 +102,7 @@
  54. endif(OpenMP_CXX_FLAGS AND NOT MSVC)
  55. target_link_libraries(enblend ${common_libs} ${additional_libs})
  56. target_link_libraries(enfuse ${common_libs} ${additional_libs})
  57. -install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
  58. +install(TARGETS enblend enfuse DESTINATION bin)
  59. if(NOT WIN32)
  60. # create enblend.1 and enfuse.1