Commit b31d8859 authored by Kersten Schuster's avatar Kersten Schuster

Adapted CMakeLists.txt to produce correct bundle path names. Updated OF submodule.

parent 1b09023c
Pipeline #4876 failed with stage
in 90 minutes and 17 seconds
...@@ -189,7 +189,7 @@ endif() ...@@ -189,7 +189,7 @@ endif()
# Configure the executables path for tests # Configure the executables path for tests
# ======================================================================== # ========================================================================
if (APPLE) 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 ) elseif( WIN32 )
SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_PRODUCT_STRING}.exe" ) SET( OPENFLIPPER_EXECUTABLE "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_PRODUCT_STRING}.exe" )
else() else()
...@@ -463,7 +463,7 @@ if ( APPLE ) ...@@ -463,7 +463,7 @@ if ( APPLE )
add_dependencies (fixbundle ${OPENFLIPPER_PRODUCT_STRING} OpenFlipperPluginLib ${OPENFLIPPER_PLUGINS}) add_dependencies (fixbundle ${OPENFLIPPER_PRODUCT_STRING} OpenFlipperPluginLib ${OPENFLIPPER_PLUGINS})
# install bundle # 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) USE_SOURCE_PERMISSIONS)
# Extra target for building an OpenFlipper package on mac # Extra target for building an OpenFlipper package on mac
......
Subproject commit cec1d0af5af7494c41dd2c91d797a66f14d10866 Subproject commit 055b5235afa94e8a89e2e28f4ebbf324b17c4fb8
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment