Merges with dev and fixes minors in CMakeLists

OpenSEMBA · Dec 16, 2024 · c2bb267 · c2bb267
1 parent 5d2a515
commit c2bb267
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,6 +78,7 @@ if(SEMBA_FDTD_ENABLE_SMBJSON)
 	set(SMBJSON_LIBRARIES smbjson)
 endif()
 if (SEMBA_FDTD_ENABLE_MTLN)
+	set(NGSPICE_LIB ngspice)
 	add_definitions(-DCompileWithMTLN)
 	add_subdirectory(src_mtln)
 	set(MTLN_LIBRARIES mtlnsolver ngspice_interface)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -19,5 +19,5 @@ endif()
 
 if (SEMBA_FDTD_ENABLE_MTLN)
 	add_subdirectory("ngspice/")
-	set(NGSPICE_LIB ngspice)
+	# set(NGSPICE_LIB ngspice)
 endif()
diff --git a/src_mtln/interface/CMakeLists.txt b/src_mtln/interface/CMakeLists.txt
@@ -6,7 +6,6 @@ enable_language(C CXX)
 add_library(ngspice_interface
     "ngspice_interface.c"
 )
-
 target_link_libraries(ngspice_interface PRIVATE ${NGSPICE_LIB})
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	target_link_libraries(ngspice_interface PRIVATE	stdc++)