Changes to compile with xspice

CMakeLists.txt

@@ -110,11 +110,12 @@ add_library(ngspice-maths
 	"./src/maths/KLU/colamd_global.c"
 )
 target_include_directories(ngspice-maths PUBLIC
-    "./src/maths/poly"
-    "./src/maths/KLU"
-	"./src/include/ngspice"
+    "./src/maths/poly/"
+	"./src/include/ngspice/"
 )
 
+
+
 add_library(ngspice-xspice
 	"./src/xspice/enh/enh.c"
 	"./src/xspice/enh/enhtrans.c"
@@ -1484,6 +1485,7 @@ target_include_directories(ngspice-spicelib PUBLIC
 
 # -------- Shared spice -----
 # target_link_libraries(ngspice-spicelib ngspice-maths)
+
 target_link_libraries(ngspice-spicelib ngspice-maths ngspice-xspice)
 add_library(ngspice
 	# "./src/nghelp.c"
@@ -1498,7 +1500,6 @@ target_link_libraries(ngspice ngspice-spicelib)
 # )
 # target_link_libraries(ngspice_main ngspice-spicelib)
 
-
 # ------- Tests
 if (NGSPICE_ENABLE_TESTS)
 	# TODO

ChangeLog

@@ -4297,7 +4297,7 @@ kept only for historical reasons.
  * src/include/ngspice/cidersupt.h,
  * src/include/ngspice/cluster.h,
  * src/include/ngspice/compatmode.h,
- * src/include/ngspice/complex.h,
+ * src/include/ngspice/ngcomplex.h,
  * src/include/ngspice/cpstd.h,
  * src/include/ngspice/defines.h,
  * src/include/ngspice/dllitf.h,
@@ -4328,7 +4328,7 @@ kept only for historical reasons.
 
 2013-01-22  rlar <rlar>
  * src/frontend/com_measure2.h,
- * src/include/ngspice/complex.h,
+ * src/include/ngspice/ngcomplex.h,
  * src/include/ngspice/cpstd.h,
  * src/include/ngspice/defines.h,
  * src/include/ngspice/fteinput.h,
@@ -9899,7 +9899,7 @@ kept only for historical reasons.
    polish make maintainer-clean, make mrproper
 
 2012-02-07  Robert Larice
- * src/include/ngspice/complex.h :
+ * src/include/ngspice/ngcomplex.h :
    #4/4 finish the switch from ngcomplex* args to ngcomplex
 
 2012-02-07  Robert Larice
@@ -9922,7 +9922,7 @@ kept only for historical reasons.
  * src/frontend/plotting/plotcurv.c ,
  * src/frontend/plotting/plotit.c ,
  * src/frontend/plotting/xgraph.c ,
- * src/include/ngspice/complex.h ,
+ * src/include/ngspice/ngcomplex.h ,
  * src/maths/cmaths/cmath1.c ,
  * src/maths/cmaths/cmath2.c ,
  * src/maths/cmaths/cmath3.c ,
@@ -9935,15 +9935,15 @@ kept only for historical reasons.
 
 2012-02-07  Robert Larice
  * src/frontend/diff.c ,
- * src/include/ngspice/complex.h ,
+ * src/include/ngspice/ngcomplex.h ,
  * src/maths/cmaths/cmath1.c ,
  * src/maths/cmaths/cmath2.c ,
  * src/maths/cmaths/cmath3.c ,
  * src/maths/cmaths/cmath4.c :
    #2/4 switch cph() and cmag() args from ngcomplex* to ngcomplex
 
 2012-02-07  Robert Larice
- * src/include/ngspice/complex.h :
+ * src/include/ngspice/ngcomplex.h :
    #1/4 drop cast (enable compiler type check)
 
 2012-02-07  Holger Vogt / Robert Larice

src/include/ngspice/config.h

@@ -11,7 +11,7 @@
 /* #undef CAPBYPASS */
 
 /* The CIDER enhancements */
-// #define CIDER 1
+#define CIDER 1
 
 /* Define to 1 if the `closedir' function returns void instead of int. */
 /* #undef CLOSEDIR_VOID */
@@ -442,7 +442,7 @@
 #define IPC_UNIX_SOCKETS 1
 
 /* Define if we want KLU linear systems solver */
-// #define KLU /**/
+#define KLU 1
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"