From e10ebe33d7bbf8537583940174c661904f1b461b Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Fri, 11 Sep 2020 17:25:27 +0200
Subject: [PATCH] fixed cmake command

---
 docs/CMakeLists.txt       |  6 ++++--
 docs/gen_server_doc.py.in | 18 ++++++++++++++----
 docs/src/servers.rst      |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index d8e63a448..8209215ef 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -63,9 +63,12 @@ configure_file(
   "${SPHINX_BUILD}/gen_server_doc.py"
   @ONLY)
 
+
+add_custom_target(server_rst python gen_server_doc.py)  
+
 add_custom_target(docs
               gendoc
-              python gen_server_doc.py
+              COMMAND python gen_server_doc.py
               COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
               COMMAND ${SPHINX_EXECUTABLE} -a -b html
               -Dbreathe_projects.slsDetectorPackage=${CMAKE_CURRENT_BINARY_DIR}/xml
@@ -82,4 +85,3 @@ add_custom_target(rst
               ${SPHINX_BUILD}/html
               COMMENT "Generating documentation with Sphinx")
 
-add_custom_target(server_rst python gen_server_doc.py)
\ No newline at end of file
diff --git a/docs/gen_server_doc.py.in b/docs/gen_server_doc.py.in
index b99c3e0ad..2a4d154fa 100644
--- a/docs/gen_server_doc.py.in
+++ b/docs/gen_server_doc.py.in
@@ -2,15 +2,21 @@ import os
 import re
 from pathlib import Path
 
+
+
 # @CMAKE_CURRENT_BINARY_DIR@
 
-src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
+print('\n\n\n\n SERVER CSV')
 
-detectors = ['Mythen3', 'Gotthard2', 'Eiger', 'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
+src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
+detectors = ['Mythen3', 'Gotthard2', 'Eiger', 
+            'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
 
 
 for det in detectors:
-    with open(src/f'{det.lower()}DetectorServer/slsDetectorServer_defs.h') as f:
+    in_fname = src/f'{det.lower()}DetectorServer/slsDetectorServer_defs.h'
+    print(f'Reading: {in_fname}')
+    with open(in_fname) as f:
         lines = f.read().replace('\\\n', '')
         lines = lines.splitlines(keepends = True)
 
@@ -38,6 +44,10 @@ for det in detectors:
 
 
     rstpath = Path('@CMAKE_SOURCE_DIR@')/'docs/src/'
-    with open(f'src/{det.lower()}.csv', 'w') as f:
+
+    out_fname = Path.cwd()/f'src/{det.lower()}.csv'
+    print(f'Writing: {out_fname}')
+    with open(out_fname, 'w') as f:
         f.writelines(output)
 
+print('END\n\n\n\n')
\ No newline at end of file
diff --git a/docs/src/servers.rst b/docs/src/servers.rst
index 34edc8de0..67a1649c8 100644
--- a/docs/src/servers.rst
+++ b/docs/src/servers.rst
@@ -23,7 +23,7 @@ Moench
 -------------
 
 .. csv-table:: Default values
-   :file: moech.csv
+   :file: moench.csv
    :widths: 35, 35
    :header-rows: 1