Skip to content

Commit

Permalink
CMake: do not bundle command-line programs with Inspector app
Browse files Browse the repository at this point in the history
Command-line programs are now system-independent (relocatable).
Hence, they can be deployed outside the bundle, together with
a copy of the marsyas library.
  • Loading branch information
jleben committed Feb 27, 2015
1 parent 0cedb4f commit 8c81926
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/qt5apps/inspector/CMakeLists.txt
Expand Up @@ -63,19 +63,7 @@ if(APPLE)
install(DIRECTORY ${qt5_dir}/qml/QtQuick/Layouts DESTINATION ${bundle_dir}/Contents/qml/QtQuick)
install(FILES qt.macos.conf DESTINATION ${bundle_dir}/Contents/Resources RENAME qt.conf)

# Bundle marsyas-run with inspector:
add_dependencies( inspector marsyas-run )
set(marsyas-run-executable ${CMAKE_BINARY_DIR}/bin/marsyas-run)
install(PROGRAMS ${marsyas-run-executable} DESTINATION ${bundle_dir}/Contents/MacOS)

# Bundle marsyas-run with inspector:
add_dependencies( inspector marsyas-info )
set(marsyas-info-executable ${CMAKE_BINARY_DIR}/bin/marsyas-info)
install(PROGRAMS ${marsyas-info-executable} DESTINATION ${bundle_dir}/Contents/MacOS)

set(extra_fixup_items
${bundle_dir}/Contents/MacOS/marsyas-run
${bundle_dir}/Contents/MacOS/marsyas-info
${bundle_dir}/Contents/plugins/platforms/libqcocoa.dylib
${bundle_dir}/Contents/qml/QtQuick.2/libqtquick2plugin.dylib
${bundle_dir}/Contents/qml/QtQuick.2/libqtquick2plugin_debug.dylib
Expand Down

0 comments on commit 8c81926

Please sign in to comment.