Blob Blame Raw
diff -ur nest-simulator-2.18.0.orig/doc/CMakeLists.txt nest-simulator-2.18.0/doc/CMakeLists.txt
--- nest-simulator-2.18.0.orig/doc/CMakeLists.txt	2019-06-27 21:03:52.000000000 +0100
+++ nest-simulator-2.18.0/doc/CMakeLists.txt	2019-07-19 09:59:04.821572528 +0100
@@ -36,12 +36,12 @@
         # Extract help from all source files in the source code, put
         # them in doc/help and generate a local help index in the
         # build directory containing links to the help files.
-        install( CODE
-          "execute_process(
-             COMMAND ${PYTHON_EXECUTABLE} -B generate_help.py \"${PROJECT_SOURCE_DIR}\" \"${PROJECT_BINARY_DIR}\"
-             WORKING_DIRECTORY \"${PROJECT_SOURCE_DIR}/extras/help_generator\"
-             )"
-          )
+        # install( CODE
+          # "execute_process(
+             # COMMAND ${PYTHON_EXECUTABLE} -B generate_help.py \"${PROJECT_SOURCE_DIR}\" \"${PROJECT_BINARY_DIR}\"
+             # WORKING_DIRECTORY \"${PROJECT_SOURCE_DIR}/extras/help_generator\"
+             # )"
+          # )
 
         # Copy the local doc/help directory to the global installation
         # directory for documentation.
diff -ur nest-simulator-2.18.0.orig/extras/ConnPlotter/CMakeLists.txt nest-simulator-2.18.0/extras/ConnPlotter/CMakeLists.txt
--- nest-simulator-2.18.0.orig/extras/ConnPlotter/CMakeLists.txt	2019-06-27 21:03:52.000000000 +0100
+++ nest-simulator-2.18.0/extras/ConnPlotter/CMakeLists.txt	2019-07-19 09:57:21.629046268 +0100
@@ -18,14 +18,14 @@
 # along with NEST.  If not, see <http://www.gnu.org/licenses/>.
 
 if ( HAVE_PYTHON )
-  install( CODE "execute_process(
-  COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
-                             install --prefix=${CMAKE_INSTALL_PREFIX}
-                                     --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
-                                     --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
-                                     --install-data=${CMAKE_INSTALL_FULL_DATADIR}
-    WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
-      )
+  # install( CODE "execute_process(
+  # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
+                             # install --prefix=${CMAKE_INSTALL_PREFIX}
+                                     # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
+                                     # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
+                                     # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
+    # WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
+      # )
 
   install( FILES examples/connplotter_tutorial.py
       DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter
diff -ur nest-simulator-2.18.0.orig/pynest/CMakeLists.txt nest-simulator-2.18.0/pynest/CMakeLists.txt
--- nest-simulator-2.18.0.orig/pynest/CMakeLists.txt	2019-06-27 21:03:52.000000000 +0100
+++ nest-simulator-2.18.0/pynest/CMakeLists.txt	2019-07-19 09:57:54.674894555 +0100
@@ -73,14 +73,14 @@
       -D_IS_PYNEST
       )
 
-  install( CODE "execute_process(
-    COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
-                               install --prefix=${CMAKE_INSTALL_PREFIX}
-                                       --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
-                                       --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
-                                       --install-data=${CMAKE_INSTALL_FULL_DATADIR}
-    WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
-      )
+  # install( CODE "execute_process(
+    # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
+                               # install --prefix=${CMAKE_INSTALL_PREFIX}
+                                       # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
+                                       # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
+                                       # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
+    # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
+      # )
   install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ )
   install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py
       DESTINATION ${CMAKE_INSTALL_DATADIR}/extras
diff -ur nest-simulator-2.18.0.orig/topology/CMakeLists.txt nest-simulator-2.18.0/topology/CMakeLists.txt
--- nest-simulator-2.18.0.orig/topology/CMakeLists.txt	2019-06-27 21:03:52.000000000 +0100
+++ nest-simulator-2.18.0/topology/CMakeLists.txt	2019-07-19 09:58:08.541830894 +0100
@@ -82,14 +82,14 @@
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest)
 
 if ( HAVE_PYTHON )
-  install( CODE "execute_process(
-    COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
-                               install --prefix=${CMAKE_INSTALL_PREFIX}
-                                       --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
-                                       --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
-                                       --install-data=${CMAKE_INSTALL_FULL_DATADIR}
-    WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
-      )
+  # install( CODE "execute_process(
+    # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
+                               # install --prefix=${CMAKE_INSTALL_PREFIX}
+                                       # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
+                                       # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
+                                       # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
+    # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
+      # )
 
   file( GLOB topo_examples "examples/*" )
   install( FILES ${topo_examples}