From 15d60e4404c8246f008c0e83b7faf4db018e2d4d Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 23 Dec 2021 08:50:57 +0000
Subject: [PATCH 2/4] tweak PYEXECDIR
---
cmake/ConfigureSummary.cmake | 2 +-
extras/nest_vars.sh.in | 2 +-
pynest/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/ConfigureSummary.cmake b/cmake/ConfigureSummary.cmake
index 133558fd3..1e14bd474 100644
--- a/cmake/ConfigureSummary.cmake
+++ b/cmake/ConfigureSummary.cmake
@@ -204,7 +204,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
message( "" )
if ( HAVE_PYTHON )
message( "PyNEST will be installed to:" )
- message( " ${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}" )
+ message( " ${PYEXECDIR}" )
message( "" )
endif ()
message( "To set necessary environment variables, add the following line" )
diff --git a/extras/nest_vars.sh.in b/extras/nest_vars.sh.in
index 6e33190cd..bc07787ce 100644
--- a/extras/nest_vars.sh.in
+++ b/extras/nest_vars.sh.in
@@ -1,7 +1,7 @@
#!/bin/sh
# Make PyNEST available by prepending its path to PYTHONPATH in a safe way.
-export PYTHONPATH="@CMAKE_INSTALL_PREFIX@/@PYEXECDIR@${PYTHONPATH:+:$PYTHONPATH}"
+export PYTHONPATH="@PYEXECDIR@${PYTHONPATH:+:$PYTHONPATH}"
# Make NEST executables available by prepending their path to PATH.
export PATH="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@:${PATH}"
diff --git a/pynest/CMakeLists.txt b/pynest/CMakeLists.txt
index f3b0218c4..92367dc04 100644
--- a/pynest/CMakeLists.txt
+++ b/pynest/CMakeLists.txt
@@ -75,7 +75,7 @@ if ( HAVE_PYTHON )
)
install(DIRECTORY nest/ ${PROJECT_BINARY_DIR}/pynest/nest/
- DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYEXECDIR}/nest
+ DESTINATION ${PYEXECDIR}/nest
PATTERN "versionchecker.py.in" EXCLUDE
)
install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ )
--
2.33.1