Fix for static library build and mpi with multiple directories

Author: pramodk

coreneuron/CMakeLists.txt

@@ -305,6 +305,7 @@ set_target_properties(coreneuron PROPERTIES
                       SOVERSION ${VERSION_MAJOR}
                       CLEAN_DIRECT_OUTPUT 1)
 
+set_property(TARGET coreneuron PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 # Extract link defs to the whole project
 get_target_property(CORENRN_LINK_LIBS coreneuron LINK_LIBRARIES)

extra/CMakeLists.txt

@@ -27,6 +27,13 @@ string(REPLACE ";" " " CORENRN_OPTMODS "${CORENRN_OPTMECH_MODS}")
 # PGI add --c++11;-A option for c++11 flag
 string(REPLACE ";" " " CXX11_STANDARD_COMPILE_OPTION "${CMAKE_CXX11_STANDARD_COMPILE_OPTION}")
 
+
+# MPI path might be multiple directories
+if (MPI_C_INCLUDE_PATH)
+    string(REPLACE ";" " -I" CORENRN_MPI_INCLUDES "${MPI_C_INCLUDE_PATH}")
+endif()
+
+
 # Compiler flags depending on BUILD_TYPE shared as BUILD_TYPE_<LANG>_FLAGS
 string(TOUPPER "${CMAKE_BUILD_TYPE}" _BUILD_TYPE)
 set(BUILD_TYPE_C_FLAGS "${CMAKE_C_FLAGS_${_BUILD_TYPE}}")

extra/nrnivmodl_core_makefile.in

@@ -25,8 +25,8 @@ CORENRNLIB_FLAGS = -L$(libdir) -lcoreneuron
 
 # We rebuild the include dirs since a lot of stuff changes place
 INCLUDES = $(INCFLAGS) -I$(incdir) -I$(incdir)/coreneuron/utils/randoms
-ifneq (@MPI_C_INCLUDE_PATH@,)
-    INCLUDES += -I@MPI_C_INCLUDE_PATH@
+ifneq (@CORENRN_MPI_INCLUDES@,)
+    INCLUDES += -I@CORENRN_MPI_INCLUDES@
 endif
 ifneq (@reportinglib_INCLUDE_DIR@,)
     INCLUDES += -I@reportinglib_INCLUDE_DIR@