|
 |
72e9fb5 |
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
|
72e9fb5 |
index 95b7a1157..14f20daca 100644
|
|
|
72e9fb5 |
--- a/doc/CMakeLists.txt
|
|
|
72e9fb5 |
+++ b/doc/CMakeLists.txt
|
|
|
72e9fb5 |
@@ -52,12 +52,12 @@ if ( NOT CMAKE_CROSSCOMPILING )
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
# Update the global help index to include all help files in
|
|
|
72e9fb5 |
# the global installation directory for documentation.
|
|
|
72e9fb5 |
- install( CODE
|
|
|
72e9fb5 |
- "execute_process(
|
|
|
72e9fb5 |
- COMMAND ${PYTHON_EXECUTABLE} -B generate_helpindex.py \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}\"
|
|
|
72e9fb5 |
- WORKING_DIRECTORY \"${PROJECT_SOURCE_DIR}/extras/help_generator\"
|
|
|
72e9fb5 |
- )"
|
|
|
72e9fb5 |
- )
|
|
|
72e9fb5 |
+ # install( CODE
|
|
|
72e9fb5 |
+ # "execute_process(
|
|
|
72e9fb5 |
+ # COMMAND ${PYTHON_EXECUTABLE} -B generate_helpindex.py \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}\"
|
|
|
72e9fb5 |
+ # WORKING_DIRECTORY \"${PROJECT_SOURCE_DIR}/extras/help_generator\"
|
|
|
72e9fb5 |
+ # )"
|
|
|
72e9fb5 |
+ # )
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
endif ()
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
diff --git a/extras/ConnPlotter/CMakeLists.txt b/extras/ConnPlotter/CMakeLists.txt
|
|
|
72e9fb5 |
index 1f7c2b32d..e9a6c3e29 100644
|
|
|
72e9fb5 |
--- a/extras/ConnPlotter/CMakeLists.txt
|
|
|
72e9fb5 |
+++ b/extras/ConnPlotter/CMakeLists.txt
|
|
|
72e9fb5 |
@@ -18,15 +18,15 @@
|
|
|
72e9fb5 |
# along with NEST. If not, see <http://www.gnu.org/licenses/>.
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
if ( HAVE_PYTHON )
|
|
|
72e9fb5 |
- install( CODE "execute_process(
|
|
|
72e9fb5 |
- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
72e9fb5 |
- install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
72e9fb5 |
- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
72e9fb5 |
- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
72e9fb5 |
- --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
72e9fb5 |
- WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
|
|
|
72e9fb5 |
- )
|
|
|
72e9fb5 |
-
|
|
|
72e9fb5 |
+ # install( CODE "execute_process(
|
|
|
72e9fb5 |
+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
72e9fb5 |
+ # install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
72e9fb5 |
+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
72e9fb5 |
+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
72e9fb5 |
+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
72e9fb5 |
+ # WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")"
|
|
|
72e9fb5 |
+ # )
|
|
|
72e9fb5 |
+#
|
|
|
72e9fb5 |
install( FILES examples/connplotter_tutorial.py
|
|
|
72e9fb5 |
DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/ConnPlotter
|
|
|
72e9fb5 |
)
|
|
|
72e9fb5 |
diff --git a/pynest/CMakeLists.txt b/pynest/CMakeLists.txt
|
|
|
72e9fb5 |
index 6464dc6e2..82d8ab0eb 100644
|
|
|
72e9fb5 |
--- a/pynest/CMakeLists.txt
|
|
|
72e9fb5 |
+++ b/pynest/CMakeLists.txt
|
|
|
72e9fb5 |
@@ -73,14 +73,14 @@ if ( HAVE_PYTHON )
|
|
|
72e9fb5 |
-D_IS_PYNEST
|
|
|
72e9fb5 |
)
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
- install( CODE "execute_process(
|
|
|
72e9fb5 |
- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
72e9fb5 |
- install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
72e9fb5 |
- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
72e9fb5 |
- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
72e9fb5 |
- --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
72e9fb5 |
- WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
72e9fb5 |
- )
|
|
|
72e9fb5 |
+ # install( CODE "execute_process(
|
|
|
72e9fb5 |
+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
72e9fb5 |
+ # install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
72e9fb5 |
+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
72e9fb5 |
+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
72e9fb5 |
+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
72e9fb5 |
+ # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
72e9fb5 |
+ # )
|
|
|
72e9fb5 |
install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ )
|
|
|
72e9fb5 |
install( FILES ${PROJECT_BINARY_DIR}/pynest/do_tests.py
|
|
|
72e9fb5 |
DESTINATION ${CMAKE_INSTALL_DATADIR}/extras
|
|
|
72e9fb5 |
diff --git a/topology/CMakeLists.txt b/topology/CMakeLists.txt
|
|
|
72e9fb5 |
index d9575d630..c42df40d1 100644
|
|
|
72e9fb5 |
--- a/topology/CMakeLists.txt
|
|
|
72e9fb5 |
+++ b/topology/CMakeLists.txt
|
|
|
72e9fb5 |
@@ -82,14 +82,14 @@ install( FILES ${install_headers}
|
|
|
72e9fb5 |
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest)
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
if ( HAVE_PYTHON )
|
|
|
72e9fb5 |
- install( CODE "execute_process(
|
|
|
72e9fb5 |
- COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
72e9fb5 |
- install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
72e9fb5 |
- --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
72e9fb5 |
- --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
72e9fb5 |
- --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
72e9fb5 |
- WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
72e9fb5 |
- )
|
|
|
72e9fb5 |
+ # install( CODE "execute_process(
|
|
|
72e9fb5 |
+ # COMMAND ${PYTHON} setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build
|
|
|
72e9fb5 |
+ # install --prefix=${CMAKE_INSTALL_PREFIX}
|
|
|
72e9fb5 |
+ # --install-lib=${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}
|
|
|
72e9fb5 |
+ # --install-scripts=${CMAKE_INSTALL_FULL_BINDIR}
|
|
|
72e9fb5 |
+ # --install-data=${CMAKE_INSTALL_FULL_DATADIR}
|
|
|
72e9fb5 |
+ # WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")"
|
|
|
72e9fb5 |
+ # )
|
|
|
72e9fb5 |
|
|
|
72e9fb5 |
file( GLOB topo_examples "examples/*" )
|
|
|
72e9fb5 |
install( FILES ${topo_examples}
|