...
 
Commits (1)
......@@ -189,7 +189,7 @@ endif()
# Configure the executables path for tests
# ========================================================================
if (APPLE)
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/OpenFlipper.app/Contents/MacOS/${OPENFLIPPER_PRODUCT_STRING}" )
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_PRODUCT_STRING}.app/Contents/MacOS/${OPENFLIPPER_PRODUCT_STRING}" )
elseif( WIN32 )
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_PRODUCT_STRING}.exe" )
else()
......@@ -463,7 +463,7 @@ if ( APPLE )
add_dependencies (fixbundle ${OPENFLIPPER_PRODUCT_STRING} OpenFlipperPluginLib ${OPENFLIPPER_PLUGINS})
# install bundle
install (DIRECTORY ${CMAKE_BINARY_DIR}/Build/OpenFlipper.app DESTINATION .
install (DIRECTORY ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_PRODUCT_STRING}.app DESTINATION .
USE_SOURCE_PERMISSIONS)
# Extra target for building an OpenFlipper package on mac
......
......@@ -14,7 +14,7 @@ macro (acg_modify_project_dirs)
file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR})
endif ()
elseif (APPLE)
set (MAC_OPENFLIPPER_BASEDIR "OpenFlipper.app/Contents/Resources")
set (MAC_OPENFLIPPER_BASEDIR "${OPENFLIPPER_PRODUCT_STRING}.app/Contents/Resources")
set (ACG_PROJECT_DATADIR "${MAC_OPENFLIPPER_BASEDIR}")
set (ACG_PROJECT_PLUGINDIR "${MAC_OPENFLIPPER_BASEDIR}/Plugins")
set (ACG_PROJECT_LIBDIR "${MAC_OPENFLIPPER_BASEDIR}/../MacOS")
......
......@@ -40,8 +40,8 @@ endfunction(gp_item_default_embedded_path_override)
include (BundleUtilities)
# copy qt plugins to bundle
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/Plugins/*.so")
file (GLOB_RECURSE _qtplugins "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/QtPlugins/*.dylib")
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Resources/Plugins/*.so")
file (GLOB_RECURSE _qtplugins "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Resources/QtPlugins/*.dylib")
foreach (_qtp ${_qtplugins})
get_filename_component(_dir "${_qtp}" PATH)
......@@ -52,8 +52,8 @@ endforeach ()
SET( BU_CHMOD_BUNDLE_ITEMS TRUE)
# fix all dependencies
fixup_bundle (@CMAKE_BINARY_DIR@/Build/OpenFlipper.app "${_plugins};${_qtplugins}" "/usr/lib;${_qtdirs};@QWT6_LIBRARY_DIR@")
fixup_bundle (@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app "${_plugins};${_qtplugins}" "/usr/lib;${_qtdirs};@QWT6_LIBRARY_DIR@")
# create qt plugin configuration file
file(WRITE "@CMAKE_BINARY_DIR@/Build/OpenFlipper.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins")
file(WRITE "@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins")