Skip to content
Snippets Groups Projects
Commit 65814a11 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Merge branch 'feature/doc-generation-improvement' into 'develop'

Fix CMake scripts

See merge request !193
parents 57eb68c6 cfab4a0d
No related branches found
No related tags found
1 merge request!193Fix CMake scripts
...@@ -20,13 +20,10 @@ add_custom_target(doc DEPENDS userdoc) ...@@ -20,13 +20,10 @@ add_custom_target(doc DEPENDS userdoc)
if (EMACS AND GNUPLOT_FOUND AND GMSH) if (EMACS AND GNUPLOT_FOUND AND GMSH)
add_custom_command( add_custom_target(pugsdoc-dir
OUTPUT "${PUGS_BINARY_DIR}/doc"
COMMAND ${CMAKE_COMMAND} -E make_directory "${PUGS_BINARY_DIR}/doc" COMMAND ${CMAKE_COMMAND} -E make_directory "${PUGS_BINARY_DIR}/doc"
) )
add_custom_target(pugsdoc-dir DEPENDS "${PUGS_BINARY_DIR}/doc")
set(ORG_GENERATOR_FILES set(ORG_GENERATOR_FILES
"${PUGS_SOURCE_DIR}/doc/lisp/build-doc-config.el" "${PUGS_SOURCE_DIR}/doc/lisp/build-doc-config.el"
"${PUGS_SOURCE_DIR}/doc/lisp/share/pugs.el" "${PUGS_SOURCE_DIR}/doc/lisp/share/pugs.el"
...@@ -102,12 +99,12 @@ if (EMACS AND GNUPLOT_FOUND AND GMSH) ...@@ -102,12 +99,12 @@ if (EMACS AND GNUPLOT_FOUND AND GMSH)
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
@ONLY) @ONLY)
set_source_files_properties( # set_source_files_properties(
${PUGS_BINARY_DIR}/build-pdf.sh2 # ${PUGS_BINARY_DIR}/build-pdf.sh2
PROPERTIES # PROPERTIES
GENERATED TRUE # GENERATED TRUE
HEADER_FILE_ONLY TRUE # HEADER_FILE_ONLY TRUE
) # )
add_custom_target(userdoc-pdf DEPENDS pugsdoc-dir "${PUGS_BINARY_DIR}/doc/userdoc.pdf" "${PUGS_BINARY_DIR}/doc/build-userdoc-pdf.sh") add_custom_target(userdoc-pdf DEPENDS pugsdoc-dir "${PUGS_BINARY_DIR}/doc/userdoc.pdf" "${PUGS_BINARY_DIR}/doc/build-userdoc-pdf.sh")
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#+LATEX_HEADER: \usepackage{siunitx} #+LATEX_HEADER: \usepackage{siunitx}
#+LATEX_HEADER: \usepackage[table]{xcolor} #+LATEX_HEADER: \usepackage[table]{xcolor}
#+LATEX_HEADER: \usepackage{colortbl} #+LATEX_HEADER: \usepackage{colortbl}
#+LATEX_HEADER: \hypersetup{linktoc = all, colorlinks = true, linkcolor = blue}
#+LATEX_COMPILER: pdflatex --shell-escape #+LATEX_COMPILER: pdflatex --shell-escape
#+LATEX_HEADER_EXTRA: \usepackage{amsmath} #+LATEX_HEADER_EXTRA: \usepackage{amsmath}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment