From c6de29fcc30949e7d0b22962d2c6e7f6320b0c49 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Thu, 27 Jul 2023 13:02:18 +0100 Subject: [PATCH] feat(nest): update nest extension installation dir The `/nest` bit seems to be included in `NEST_LIBDIR` now, so does not need to be explicitly added: https://github.com/nest/nest-extension-module/blob/master/CMakeLists.txt#L178 I expect `nest-config --libdir` provides the complete path already. --- pyNN/nest/extensions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyNN/nest/extensions/CMakeLists.txt b/pyNN/nest/extensions/CMakeLists.txt index a24cadeb..4463c6d7 100644 --- a/pyNN/nest/extensions/CMakeLists.txt +++ b/pyNN/nest/extensions/CMakeLists.txt @@ -168,7 +168,7 @@ execute_process( set( CMAKE_MACOSX_RPATH ON ) # Install all stuff to NEST's install directories. -set( CMAKE_INSTALL_LIBDIR ${NEST_LIBDIR}/nest CACHE STRING "object code libraries (lib/nest or lib64/nest or lib//nest on Debian)" FORCE ) +set( CMAKE_INSTALL_LIBDIR ${NEST_LIBDIR} CACHE STRING "object code libraries (lib/nest or lib64/nest or lib//nest on Debian)" FORCE ) set( CMAKE_INSTALL_DOCDIR ${NEST_DOCDIR} CACHE STRING "documentation root (DATAROOTDIR/doc/nest)" FORCE ) set( CMAKE_INSTALL_DATADIR ${NEST_DATADIR} CACHE STRING "read-only architecture-independent data (DATAROOTDIR/nest)" FORCE )