From 54d5d4cc6315bafe3e46c246d1476e985736a8c1 Mon Sep 17 00:00:00 2001 From: johltn Date: Sat, 31 Oct 2020 16:35:35 +0100 Subject: [PATCH] Try pip install for sphinx --- .travis.yml | 3 ++- docs/CMakeLists.txt | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcf1e43640..507d48eee7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,9 @@ install: sudo apt-get install -y \ libocct-data-exchange-dev libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev \ libboost-system-dev libboost-program-options-dev libboost-regex-dev libboost-thread-dev libboost-date-time-dev libboost-iostreams-dev libboost-filesystem-dev \ - build-essential cmake python2.7 libpython2.7-dev swig zlib1g liblzma5 opencollada-dev wget apt-transport-https python3 python3-pip python3-setuptools doxygen python3-sphinx + build-essential cmake python2.7 libpython2.7-dev swig zlib1g liblzma5 opencollada-dev wget apt-transport-https python3 python3-pip python3-setuptools doxygen - sudo mkdir -p /usr/include/json/nlohmann/ + - python3 -m pip install -U --pre sphinx - python3 -m pip install exhale - sudo wget https://github.com/nlohmann/json/releases/download/v3.6.1/json.hpp -O /usr/include/json/nlohmann/json.hpp # - sudo sh -c 'curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -' diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 1d026fc1af..c245557d05 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -29,11 +29,11 @@ add_custom_target(Sphinx ALL WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/output COMMENT "Generating documentation with Sphinx") -# add_custom_target(ifcopenshell_python_docs ALL - # COMMAND make html - # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src//ifcblenderexport/docs - # OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/..//src/ifcblenderexport/docs - # COMMENT "Generating documentation with Sphinx") +add_custom_target(ifcopenshell_python_docs ALL + COMMAND make html + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../src//ifcblenderexport/docs + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/..//src/ifcblenderexport/docs + COMMENT "Generating documentation with Sphinx") else (DOXYGEN_FOUND) message("Doxygen need to be installed to generate the doxygen documentation")