Fixes for NMODL/MOD2C binary

  - fix issue when NMODL is set with CORENRN_NMODL_DIR
  - fix issue with finding _kinderiv.h when installed as submodule of Neuron

Author: iomaganaris

coreneuron/CMakeLists.txt

@@ -7,6 +7,7 @@
 # commonly included directories
 include_directories(utils/randoms
                     ${MPI_INCLUDE_PATH}
+                    ${PROJECT_BINARY_DIR}/coreneuron
                     ${CMAKE_BINARY_DIR}/coreneuron
                     ${CMAKE_BINARY_DIR}/include)
 

extra/nrnivmodl_core_makefile.in

@@ -18,7 +18,11 @@ datadir:= $(ROOT)/share/coreneuron
 datadir_mod2c := $(ROOT)/share/mod2c
 
 # Binary of MOD2C/NMODL depending on what was activated
-nmodl_binary_path = $(if $(NMODL_BINARY),$(NMODL_BINARY), $(bindir)/@nmodl_binary_name@)
+ifeq (@nmodl_FOUND@, TRUE)
+    nmodl_binary_path = $(if $(NMODL_BINARY),$(NMODL_BINARY), @CORENRN_NMODL_BINARY@)
+else
+    nmodl_binary_path = $(if $(NMODL_BINARY),$(NMODL_BINARY), $(bindir)/@nmodl_binary_name@)
+endif
 
 # Additional variables set in CMAKE usable here
 # - @CORENRN_COMPILE_DEFS