From 53d560968c0bb716b548c1e7a62b614dced64f3f Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Mon, 3 Mar 2025 08:39:32 +0100
Subject: [PATCH] Copy of openMP dll only in case of openMP build

---
 visualc/make-install-vngspice.bat  | 7 ++++++-
 visualc/make-install-vngspiced.bat | 7 ++++++-
 visualc/vngspice.vcxproj           | 8 ++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat
index d1e51d958..9e05ff920 100644
--- a/visualc/make-install-vngspice.bat
+++ b/visualc/make-install-vngspice.bat
@@ -10,7 +10,12 @@ set cmsrc=.\codemodels\x64\Release
 mkdir %dst%\bin
 mkdir %dst%\lib\ngspice
 
-copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\
+if "%2" == "omp" (
+    copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\
+)
+if "%3" == "omp" (
+    copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\
+)
 copy %cmsrc%\analog64.cm %dst%\lib\ngspice\analog.cm
 copy %cmsrc%\digital64.cm %dst%\lib\ngspice\digital.cm
 copy %cmsrc%\table64.cm %dst%\lib\ngspice\table.cm
diff --git a/visualc/make-install-vngspiced.bat b/visualc/make-install-vngspiced.bat
index 9b8b49894..5fc5eaf1a 100644
--- a/visualc/make-install-vngspiced.bat
+++ b/visualc/make-install-vngspiced.bat
@@ -10,7 +10,12 @@ set cmsrc=.\codemodels\x64\Debug
 mkdir %dst%\bin
 mkdir %dst%\lib\ngspice
 
-copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140d.x86_64.dll" %dst%\bin\
+if "%2" == "omp" (
+    copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\
+)
+if "%3" == "omp" (
+    copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\
+)
 copy %cmsrc%\analog64.cm %dst%\lib\ngspice\analog.cm
 copy %cmsrc%\digital64.cm %dst%\lib\ngspice\digital.cm
 copy %cmsrc%\table64.cm %dst%\lib\ngspice\table.cm
diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
index 046bd42ee..9b95ffeff 100644
--- a/visualc/vngspice.vcxproj
+++ b/visualc/vngspice.vcxproj
@@ -424,10 +424,10 @@
     <PostBuildEvent>
       <!-- Check, if FFTW-Folder exist -->
       <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
-        make-install-vngspice.bat $(OutDir) fftw
+        make-install-vngspice.bat $(OutDir) fftw omp
       </Command>
       <Command Condition="!Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
-        make-install-vngspice.bat $(OutDir)
+        make-install-vngspice.bat $(OutDir) omp
       </Command>
     </PostBuildEvent>
     <Manifest>
@@ -490,10 +490,10 @@
     <PostBuildEvent>
       <!-- Check, if FFTW-Folder exist -->
       <Command Condition="Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
-        make-install-vngspice.bat $(OutDir) fftw
+        make-install-vngspice.bat $(OutDir) fftw omp
       </Command>
       <Command Condition="!Exists('$(ProjectDir)..\..\fftw-3.3-dll64')">
-        make-install-vngspice.bat $(OutDir)
+        make-install-vngspice.bat $(OutDir) omp
       </Command>
     </PostBuildEvent>
     <Manifest>