Skip to content
Snippets Groups Projects
Commit 52fbb069 authored by Javier Lopez-Gomez's avatar Javier Lopez-Gomez
Browse files

[Doxygen] Fix problems with documentation generation on macOS

- fix `mktemp` command lines to only use template 'X's at the end

- use `sysctl -n hw.ncpu` instead to get the number of available CPUs on Darwin

- move OS-dependent variable assignments to the Makefile
parent b890efd8
Branches
Tags
No related merge requests found
.PHONY: filter folders mathjax js images doxygen replaceCollaborationDiagrams .PHONY: filter folders mathjax js images doxygen replaceCollaborationDiagrams
NJOB ?= $(shell nproc) OS=$(shell uname)
ifeq ($(UNAME), Darwin)
export DOXYGEN_LDD := otool -L
NJOB ?= $(shell sysctl -n hw.ncpu)
else
export DOXYGEN_LDD := ldd
NJOB ?= $(shell nproc)
endif
PYTHON_EXECUTABLE ?= python3 PYTHON_EXECUTABLE ?= python3
export PYTHON_EXECUTABLE export PYTHON_EXECUTABLE
export PYSPARK_PYTHON := $(PYTHON_EXECUTABLE) export PYSPARK_PYTHON := $(PYTHON_EXECUTABLE)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
HTMLPATH=$DOXYGEN_OUTPUT_DIRECTORY/html HTMLPATH=$DOXYGEN_OUTPUT_DIRECTORY/html
DOXYGEN_LDD=${DOXYGEN_LDD:=ldd} DOXYGEN_LDD=${DOXYGEN_LDD:=ldd}
dotFile=$(mktemp /tmp/libraries_XXXX.dot) dotFile=$(mktemp /tmp/libraries.dot.XXXX)
test -d "$HTMLPATH" || { echo "HTMLPATH '$HTMLPATH' not found."; exit 1; } test -d "$HTMLPATH" || { echo "HTMLPATH '$HTMLPATH' not found."; exit 1; }
test -d "$ROOTSYS" || { echo "ROOTSYS not set"; exit 1; } test -d "$ROOTSYS" || { echo "ROOTSYS not set"; exit 1; }
......
...@@ -4,16 +4,7 @@ ...@@ -4,16 +4,7 @@
# Finding the system we are running # Finding the system we are running
export DOXYGEN_LDD="ldd" listOfClasses=$(mktemp /tmp/listOfClasses.XXXXXX)
listOfClasses=$(mktemp /tmp/listOfClasses_XXXXXX.txt)
OS=`uname`
case "$OS" in
"Linux") export DOXYGEN_LDD="ldd"
;;
"Darwin")export DOXYGEN_LDD="otool -L"
;;
esac
case "$1" in case "$1" in
-j*) -j*)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment