Commit edf2c337 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'hotfixOSXMissingPlugins' into 'master'

avoid using uninitialised OPENFLIPPER_PRODUCT_STRING in make

See merge request !16
parents 7639be30 31da2420
......@@ -14,7 +14,12 @@ macro (acg_modify_project_dirs)
file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR})
endif ()
elseif (APPLE)
set (MAC_OPENFLIPPER_BASEDIR "${OPENFLIPPER_PRODUCT_STRING}.app/Contents/Resources")
if(OPENFLIPPER_PRODUCT_STRING)
set (MAC_OPENFLIPPER_BASEDIR "${OPENFLIPPER_PRODUCT_STRING}.app/Contents/Resources")
else()
message(WARNING "OPENFLIPPER_PRODUCT_STRING is not set, using OpenFlipper as fallback")
set (MAC_OPENFLIPPER_BASEDIR "OpenFlipper.app/Contents/Resources")
endif()
set (ACG_PROJECT_DATADIR "${MAC_OPENFLIPPER_BASEDIR}")
set (ACG_PROJECT_PLUGINDIR "${MAC_OPENFLIPPER_BASEDIR}/Plugins")
set (ACG_PROJECT_LIBDIR "${MAC_OPENFLIPPER_BASEDIR}/../MacOS")
......
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