mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mac build: correctly deal with no printing

Browse source 
Including working around a weird hack to install the Grantlee
plugins.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-07-15 21:51:42 -07:00
parent a629eb7070
commit 20f5609a6c
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -397,7 +397,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
install(FILES ${QTTRANSLATIONS} DESTINATION ${RESOURCEDIR}/translations)
install(FILES ${CMAKE_SOURCE_DIR}/gpl-2.0.txt DESTINATION ${RESOURCEDIR})
# this is a HACK
if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
if((${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") AND (NOT NO_PRINTING))
install(DIRECTORY ${Grantlee5_DIR}/../../grantlee DESTINATION ${PLUGINDIR})
endif()
# this is a hack - but I don't know how else to find the macdeployqt program if it's not in the PATH

2
scripts/build.sh
View file

@ -403,6 +403,8 @@ if [ "$BUILDGRANTLEE" = "1" ] ; then
$SRC/grantlee
make -j4
make install
else
PRINTING="-DNO_PRINTING=ON"
fi