|
|
539ebce |
diff -ur nest-simulator-2.16.0.orig/extras/ConnPlotter/CMakeLists.txt nest-simulator-2.16.0/extras/ConnPlotter/CMakeLists.txt
|
|
|
539ebce |
--- nest-simulator-2.16.0.orig/extras/ConnPlotter/CMakeLists.txt 2018-09-15 20:51:08.153203492 +0100
|
|
|
539ebce |
+++ nest-simulator-2.16.0/extras/ConnPlotter/CMakeLists.txt 2018-09-15 20:52:16.277867696 +0100
|
|
|
539ebce |
@@ -19,13 +19,13 @@
|
|
|
c9aab32 |
|
|
|
c9aab32 |
if ( HAVE_PYTHON )
|
|
|
c9aab32 |
- install( CODE "execute_process(
|
|
|
c9aab32 |
- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
c9aab32 |
- install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
c9aab32 |
- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
c9aab32 |
- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
c9aab32 |
- --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
c9aab32 |
- WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
|
|
|
c9aab32 |
- )
|
|
|
c9aab32 |
+ # install( CODE "execute_process(
|
|
|
c9aab32 |
+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
c9aab32 |
+ # install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
c9aab32 |
+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
c9aab32 |
+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
c9aab32 |
+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
c9aab32 |
+ # WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
|
|
|
c9aab32 |
+ # )
|
|
|
c9aab32 |
|
|
|
c9aab32 |
install( FILES examples/connplotter_tutorial.py
|
|
|
c9aab32 |
DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter
|
|
|
539ebce |
diff -ur nest-simulator-2.16.0.orig/pynest/CMakeLists.txt nest-simulator-2.16.0/pynest/CMakeLists.txt
|
|
|
539ebce |
--- nest-simulator-2.16.0.orig/pynest/CMakeLists.txt 2018-09-15 20:51:08.203203246 +0100
|
|
|
539ebce |
+++ nest-simulator-2.16.0/pynest/CMakeLists.txt 2018-09-15 20:52:57.497664513 +0100
|
|
|
539ebce |
@@ -73,14 +73,14 @@
|
|
|
c9aab32 |
-D_IS_PYNEST
|
|
|
c9aab32 |
)
|
|
|
c9aab32 |
|
|
|
c9aab32 |
- install( CODE "execute_process(
|
|
|
c9aab32 |
- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
c9aab32 |
- install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
c9aab32 |
- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
c9aab32 |
- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
c9aab32 |
- --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
c9aab32 |
- WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
c9aab32 |
- )
|
|
|
c9aab32 |
+ # install( CODE "execute_process(
|
|
|
c9aab32 |
+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
c9aab32 |
+ # install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
c9aab32 |
+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
c9aab32 |
+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
c9aab32 |
+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
c9aab32 |
+ # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
c9aab32 |
+ # )
|
|
|
c9aab32 |
install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ )
|
|
|
c9aab32 |
install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py
|
|
|
c9aab32 |
DESTINATION ${CMAKE_INSTALL_DATADIR}/extras
|
|
|
539ebce |
diff -ur nest-simulator-2.16.0.orig/topology/CMakeLists.txt nest-simulator-2.16.0/topology/CMakeLists.txt
|
|
|
539ebce |
--- nest-simulator-2.16.0.orig/topology/CMakeLists.txt 2018-09-15 20:51:08.248203024 +0100
|
|
|
539ebce |
+++ nest-simulator-2.16.0/topology/CMakeLists.txt 2018-09-15 20:53:22.620540676 +0100
|
|
|
539ebce |
@@ -85,14 +85,14 @@
|
|
|
539ebce |
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest)
|
|
|
c9aab32 |
|
|
|
c9aab32 |
if ( HAVE_PYTHON )
|
|
|
c9aab32 |
- install( CODE "execute_process(
|
|
|
c9aab32 |
- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
c9aab32 |
- install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
c9aab32 |
- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
c9aab32 |
- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
c9aab32 |
- --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
c9aab32 |
- WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
c9aab32 |
- )
|
|
|
c9aab32 |
+ # install( CODE "execute_process(
|
|
|
c9aab32 |
+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
c9aab32 |
+ # install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
c9aab32 |
+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
c9aab32 |
+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
c9aab32 |
+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
c9aab32 |
+ # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
c9aab32 |
+ # )
|
|
|
c9aab32 |
|
|
|
c9aab32 |
file( GLOB topo_examples "examples/*" )
|
|
|
c9aab32 |
install( FILES ${topo_examples}
|