Possibly fix link issue with libpython

neuronsimulator · Jan 28, 2025 · dce10e9 · dce10e9
1 parent 3ceeec0
commit dce10e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -689,9 +689,8 @@ set(NRN_RUN_FROM_BUILD_DIR_ENV "NEURONHOME=${PROJECT_BINARY_DIR}/share/nrn"
 # if we do not link against Python, NMODL will complain that some of the env variables are missing
 # when building coreNEURON mod files
 if(NOT NRN_LINK_AGAINST_PYTHON)
-  list(GET NRN_PYTHON_LIBRARIES 0 PYTHONLIB)
   set(NRN_RUN_FROM_BUILD_DIR_ENV "${NRN_RUN_FROM_BUILD_DIR_ENV}" "NMODLHOME=${PROJECT_BINARY_DIR}"
-                                 "NMODL_PYLIB=${PYTHONLIB}")
+                                 "NMODL_PYLIB=${PYTHON_LIBRARY}")
 endif()
 prepend_to_var(PATH "${PROJECT_BINARY_DIR}/bin")
 if(APPLE)

diff --git a/test/nmodl/transpiler/unit/CMakeLists.txt b/test/nmodl/transpiler/unit/CMakeLists.txt
@@ -179,7 +179,7 @@ endforeach()
 
 foreach(test_name testcodegen testvisitor)
   if(NOT NRN_LINK_AGAINST_PYTHON)
-    target_link_libraries(${test_name} PRIVATE pywrapper ${PYTHONLIB})
+    target_link_libraries(${test_name} PRIVATE pywrapper ${PYTHON_LIBRARY})
   endif()
   cpp_cc_configure_sanitizers(TARGET ${test_name})
   set(env ${test_env})

diff --git a/test/nmodl/transpiler/usecases/CMakeLists.txt b/test/nmodl/transpiler/usecases/CMakeLists.txt
@@ -41,8 +41,8 @@ foreach(usecase ${NMODL_USECASE_DIRS})
     COMMAND
       ${CMAKE_COMMAND} -E env "PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}"
       "NRNHOME=${CMAKE_BINARY_DIR}" "NEURONHOME=${CMAKE_BINARY_DIR}/share/nrn"
-      "CORENRNHOME=${CMAKE_BINARY_DIR}" "NMODL_PYLIB=${PYTHONLIB}" "NMODLHOME=${CMAKE_BINARY_DIR}"
-      "PYTHONPATH=${CMAKE_BINARY_DIR}/lib/python:$ENV{PYTHONPATH}"
+      "CORENRNHOME=${CMAKE_BINARY_DIR}" "NMODL_PYLIB=${PYTHON_LIBRARY}"
+      "NMODLHOME=${CMAKE_BINARY_DIR}" "PYTHONPATH=${CMAKE_BINARY_DIR}/lib/python:$ENV{PYTHONPATH}"
       ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh ${CMAKE_BINARY_DIR}/bin/nmodl
       ${CMAKE_CURRENT_SOURCE_DIR}/${usecase})
 endforeach()