From c2bb267417643f284cd83d11b48c98d649911950 Mon Sep 17 00:00:00 2001 From: alberto Date: Mon, 16 Dec 2024 14:27:06 +0100 Subject: [PATCH] Merges with dev and fixes minors in CMakeLists --- CMakeLists.txt | 1 + external/CMakeLists.txt | 2 +- src_mtln/interface/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c6c6b27..770d9613 100755 --- 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 index 5b3b02c7..8aec374f 100644 --- 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() \ No newline at end of file diff --git a/src_mtln/interface/CMakeLists.txt b/src_mtln/interface/CMakeLists.txt index 4ecbc565..5c59ee39 100644 --- 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++)