[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>
This commit is contained in:
ras0219 2020-10-02 16:47:14 -07:00 committed by GitHub
parent 988538e06b
commit b31c6fd389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,6 @@
Source: ngspice Source: ngspice
Version: 32 Version: 32
Port-Version: 1
Homepage: http://ngspice.sourceforge.net/ 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 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) Supports: !(linux|osx|arm|uwp)

View File

@ -2,6 +2,9 @@ vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
# ngspice produces self-contained DLLs
set(VCPKG_CRT_LINKAGE static)
vcpkg_from_sourceforge( vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO ngspice/ng-spice-rework 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}/man)
file(REMOVE_RECURSE ${SOURCE_PATH}/tests) 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( vcpkg_install_msbuild(
USE_VCPKG_INTEGRATION
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
INCLUDES_SUBPATH /src/include INCLUDES_SUBPATH /src/include
LICENSE_SUBPATH COPYING 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 PROJECT_SUBPATH visualc/sharedspice.sln
TARGET Build TARGET Build
) )