Only use $(MAKE) in doc target if make is used as generator
authorDominik Schmidt <dev@dominik-schmidt.de>
Fri, 22 Sep 2017 09:15:35 +0000 (11:15 +0200)
committerMarkus Goetz <markus@woboq.com>
Tue, 17 Oct 2017 10:50:34 +0000 (12:50 +0200)
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)

doc/CMakeLists.txt

index f603eac55f81d6fbbdd8d6471afaf575b53dc3c8..f706a701cd6aa222257aaafb01e759a07eca6a59 100644 (file)
@@ -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)