WIP

cmake/neuronConfig.cmake.in

@@ -18,6 +18,7 @@ set(_CORENEURON_MAIN "${_prefix}/share/coreneuron/coreneuron.cpp")
 set(_CORENEURON_MECH_REG "${_prefix}/share/nrn/mod_reg_corenrn.cpp.in")
 set(_CORENEURON_MECH_ENG "${_prefix}/share/coreneuron/enginemech.cpp")
 set(_CORENEURON_RANDOM_INCLUDE "${_prefix}/include/coreneuron/utils/randoms")
+set(_CORENEURON_FLAGS "@CORENRN_CXX_FLAGS@")
 
 find_program(NOCMODL nocmodl REQUIRED)
 find_program(NMODL nmodl REQUIRED)
@@ -99,10 +100,11 @@ function(create_nrnmech)
     target_include_directories(${LIBNAME} PRIVATE ${_CORENEURON_RANDOM_INCLUDE})
     target_compile_definitions(${LIBNAME} PRIVATE ADDITIONAL_MECHS NRN_PRCELLSTATE=0
       CORENEURON_BUILD)
-    target_link_libraries(${LIBNAME} neuron::corenrn)
+    target_compile_definitions(${LIBNAME} PRIVATE "${_CORENEURON_FLAGS}")
+    target_link_libraries(${LIBNAME} PUBLIC neuron::corenrn)
   else()
     add_library(${LIBNAME} SHARED ${L_SOURCES})
-    target_link_libraries(${LIBNAME} neuron::nrniv)
+    target_link_libraries(${LIBNAME} PUBLIC neuron::nrniv)
   endif()
 
   if(NRN_MECH_INSTALL_CPP)

src/nrnoc/hh.mod

@@ -30,7 +30,7 @@ NEURON {
         NONSPECIFIC_CURRENT il
         RANGE gnabar, gkbar, gl, el, gna, gk
         : `GLOBAL minf` will be replaced with `RANGE minf` if CoreNEURON enabled
-        GLOBAL minf, hinf, ninf, mtau, htau, ntau
+        RANGE minf, hinf, ninf, mtau, htau, ntau
 	THREADSAFE : assigned GLOBALs will be per thread
 }
 
@@ -94,7 +94,7 @@ PROCEDURE rates(v(mV)) {  :Computes rate and other constants at current v.
                       :Call once from HOC to initialize inf at resting v.
         LOCAL  alpha, beta, sum, q10
         : `TABLE minf` will be replaced with `:TABLE minf` if CoreNEURON enabled)
-        TABLE minf, mtau, hinf, htau, ninf, ntau DEPEND celsius FROM -100 TO 100 WITH 200
+        :TABLE minf, mtau, hinf, htau, ninf, ntau DEPEND celsius FROM -100 TO 100 WITH 200
 
 UNITSOFF
         q10 = 3^((celsius - 6.3)/10)