merge with Dev another time

This commit is contained in:
Desmis
2017-04-10 08:42:20 +02:00
50 changed files with 1765 additions and 1658 deletions

View File

@@ -48,10 +48,6 @@ install (DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN
install (DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.png")
install (FILES ${OPTIONSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME options)
if (WIN32)
install (FILES "${PROJECT_SOURCE_DIR}/doc/manpage/rawtherapee.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
endif (WIN32)
if (APPLE)
# CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE='.
set (MACOSX_BUNDLE_COMMAND DUMMY_VARIABLE=