From 09da6f32dcd2e9baef47fa25601c2fde75b80416 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 8 Aug 2022 21:57:44 -0400 Subject: [PATCH] Copy ngspice codemodels for MSVC --- cmake/Findngspice.cmake | 8 +++++++- eeschema/CMakeLists.txt | 4 ++++ qa/unittests/eeschema/CMakeLists.txt | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cmake/Findngspice.cmake b/cmake/Findngspice.cmake index f552c48a1d..08645a43a6 100644 --- a/cmake/Findngspice.cmake +++ b/cmake/Findngspice.cmake @@ -1,7 +1,7 @@ # CMake script for finding libngspice # Copyright (C) 2016 CERN -# Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors. +# Copyright (C) 2022 Kicad Developers, see AUTHORS.txt for contributors. # # Author: Maciej Suminski # @@ -133,6 +133,12 @@ elseif( WIN32 AND MSVC ) bin lib ) + + find_path(NGSPICE_CM_DIR + NAMES analog.cm digital.cm spice2poly.cm + PATH_SUFFIXES + lib/ngspice + ) else() set( NGSPICE_DLL "${NGSPICE_LIBRARY}" ) endif() diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index f81ed1d542..8fa8a59f0b 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -480,6 +480,10 @@ if( KICAD_SPICE ) add_custom_command( TARGET eeschema_kiface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NGSPICE_DLL}" "$" ) + + add_custom_command( TARGET eeschema_kiface POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory "${NGSPICE_CM_DIR}" "$/ngspice" + ) endif() endif() diff --git a/qa/unittests/eeschema/CMakeLists.txt b/qa/unittests/eeschema/CMakeLists.txt index 7600ed8b17..c8ee6e75dc 100644 --- a/qa/unittests/eeschema/CMakeLists.txt +++ b/qa/unittests/eeschema/CMakeLists.txt @@ -128,6 +128,10 @@ if( KICAD_SPICE AND MSVC ) add_custom_command( TARGET qa_eeschema POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NGSPICE_DLL}" "$" ) + + add_custom_command( TARGET qa_eeschema POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory "${NGSPICE_CM_DIR}" "$/ngspice" + ) endif()