Install sphinx with apt-get

johltn · johltn · commit 9d6468bbf6d3 · 2020-11-01T08:12:01.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -21,9 +21,8 @@ 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 
+    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 
   - 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
@@ -28,12 +28,12 @@ add_custom_target(Sphinx ALL
 				  ${SPHINX_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/output
 				  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")
