From: Dominik Schmidt Date: Fri, 22 Sep 2017 09:15:35 +0000 (+0200) Subject: Only use $(MAKE) in doc target if make is used as generator X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~700^2^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7f51803d04fb8411b425207763a584406ee04178;p=nextcloud-desktop.git Only use $(MAKE) in doc target if make is used as generator The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE) --- diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f603eac55..f706a701c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -41,7 +41,13 @@ if(SPHINX_FOUND) -D latex_logo=${LATEX_LOGO} ${CMAKE_CURRENT_SOURCE_DIR} ${SPHINX_PDF_DIR} ) - add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf + + set(MAKE "make" CACHE FILEPATH "make to be used for documentation generation if not using make as generator anyway") + if(CMAKE_GENERATOR MATCHES "Makefiles") + set(MAKE "$(MAKE)") + endif() + + add_custom_target(doc-pdf ${MAKE} -C ${SPHINX_PDF_DIR} all-pdf DEPENDS doc-latex ) add_dependencies(doc doc-pdf) endif(PDFLATEX_FOUND)