diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-10-02 16:47:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 16:47:14 -0700 |
| commit | b31c6fd3895b274d0bcbc8e1c57ef730e8f8bd20 (patch) | |
| tree | e5cc953d125c9db4473d42e8f187769f2f84caf1 | |
| parent | 988538e06b02a4b8d2b44f04613df5612e4557cd (diff) | |
| download | vcpkg-b31c6fd3895b274d0bcbc8e1c57ef730e8f8bd20.tar.gz vcpkg-b31c6fd3895b274d0bcbc8e1c57ef730e8f8bd20.zip | |
[ngspice] Disable USE_VCPKG_INTEGRATION (#13832)
This resolves a conflict with automatically linking asl.lib from ampl-mp
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/ngspice/CONTROL | 1 | ||||
| -rw-r--r-- | ports/ngspice/portfile.cmake | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL index 40a5d35b9..df7fd9b5b 100644 --- a/ports/ngspice/CONTROL +++ b/ports/ngspice/CONTROL @@ -1,5 +1,6 @@ Source: ngspice Version: 32 +Port-Version: 1 Homepage: http://ngspice.sourceforge.net/ Description: Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE Supports: !(linux|osx|arm|uwp) diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index 5265ac816..66675c8c4 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -2,6 +2,9 @@ vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+# ngspice produces self-contained DLLs
+set(VCPKG_CRT_LINKAGE static)
+
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO ngspice/ng-spice-rework
@@ -27,13 +30,12 @@ if (VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE ${SOURCE_PATH}/man)
file(REMOVE_RECURSE ${SOURCE_PATH}/tests)
- # We use build_msbuild because install_msbuild is incompatible due to SPICE using .lib for the last 47 years....
vcpkg_install_msbuild(
- USE_VCPKG_INTEGRATION
SOURCE_PATH ${SOURCE_PATH}
INCLUDES_SUBPATH /src/include
LICENSE_SUBPATH COPYING
- PLATFORM ${TRIPLET_SYSTEM_ARCH} # install_msbuild swaps x86 for win32(bad) if we dont force our own setting
+ # install_msbuild swaps x86 for win32(bad) if we dont force our own setting
+ PLATFORM ${TRIPLET_SYSTEM_ARCH}
PROJECT_SUBPATH visualc/sharedspice.sln
TARGET Build
)
|