--- CMakeLists.txt.orig 2019-06-09 12:18:38.000000000 -0700 +++ CMakeLists.txt 2019-06-16 16:02:10.000000000 -0700 @@ -328,18 +328,18 @@ ) # Copy align_image_stack into bundle/Contents/MacOS - FILE(COPY - ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/align_image_stack - DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS - FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE WORLD_EXECUTE - ) + #FILE(COPY + # ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/align_image_stack + # DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS + # FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE WORLD_EXECUTE + #) # Copy help/icons/hdrhtml and qt.conf to bundle resources FILE(COPY "${CMAKE_SOURCE_DIR}/help" DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources) FILE(COPY "${CMAKE_SOURCE_DIR}/icons" DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources) FILE(COPY "${CMAKE_SOURCE_DIR}/hdrhtml" DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources) - FILE(COPY "${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf" - DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources) + #FILE(COPY "${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf" + # DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources) # Copy Licence/README/Authors/Changelog to top of bundle FILE(COPY @@ -351,42 +351,42 @@ ) # Copy align_image_stack dependencies to bundle - FILE(COPY - ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/Libraries - DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents - ) + #FILE(COPY + # ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/Libraries + # DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents + #) # Install Boost libs - file(MAKE_DIRECTORY ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - file(COPY - ${Boost_SYSTEM_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - file(COPY - ${Boost_THREAD_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - file(COPY - ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - file(COPY - ${Boost_CHRONO_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - file(COPY - ${Boost_DATE_TIME_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - file(COPY - ${Boost_ATOMIC_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) - add_custom_command( - TARGET ${LHDR_OSX_EXECUTABLE_TARGET} - POST_BUILD - COMMAND install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr && - install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr && - install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr && - install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr && - install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr && - install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr && - install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_chrono.dylib && - install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_thread.dylib && - install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr-cli && - install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr-cli && - install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr-cli && - install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr-cli && - install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr-cli && - install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr-cli) + #file(MAKE_DIRECTORY ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #file(COPY + # ${Boost_SYSTEM_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #file(COPY + # ${Boost_THREAD_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #file(COPY + # ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #file(COPY + # ${Boost_CHRONO_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #file(COPY + # ${Boost_DATE_TIME_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #file(COPY + # ${Boost_ATOMIC_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks) + #add_custom_command( + # TARGET ${LHDR_OSX_EXECUTABLE_TARGET} + # POST_BUILD + # COMMAND install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr && + # install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr && + # install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr && + # install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr && + # install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr && + # install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr && + # install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_chrono.dylib && + # install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_thread.dylib && + # install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr-cli && + # install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr-cli && + # install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr-cli && + # install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr-cli && + # install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr-cli && + # install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr-cli) # Unix ELSEIF(UNIX)