diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-05-02 22:57:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:57:43 -0700 |
| commit | 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch) | |
| tree | 7e39943693b8ac392f37d43a03c66815c6048963 /ports/osi | |
| parent | b72f36e8cdd96ec482785e33f72f99cceebda8ad (diff) | |
| download | vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip | |
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
* [alac,benchmark,capnproto] Fix check_linkage call
* [fastlz] Fix SHA512
* [coroutine] Fix dynamic build
* [folly] Find double-conversion
* [gamma] Use vcpkg_from_github
* [librsync] Enable static builds
* [netcdf-cxx4] Fix SHA512
* [octomap] Fix static build
* [tidy-html5] Fix static build
* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime
* [folly] Use ras0219's fix for link paths
* [octomap] Fix exported targets
* [uvatlas] Set tool download SHA512
* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32
* [suitesparse] osx fix
* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions
* [duktape] Resolve conflicts
* [duktape] FIxed typo in Python paths
* [wangle] Find zlib
* [openssl-uwp] Fix SHA512
* [glib] Allow static builds on non-Windows
* [suitesparse] Fix build on Windows
* [multiple ports] Bump CONTROL version
* [multiple ports] Fix description indent
* [directxtk] Fix CONTROL file
* [bde,duktape,qpid-proton] Build packages with python2 installed
* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
* [gdal,live555,uriparser] Fix regressions
* [live555] Update to 2019.04.24
Diffstat (limited to 'ports/osi')
| -rw-r--r-- | ports/osi/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/osi/CONTROL | 4 | ||||
| -rw-r--r-- | ports/osi/portfile.cmake | 71 |
3 files changed, 29 insertions, 52 deletions
diff --git a/ports/osi/CMakeLists.txt b/ports/osi/CMakeLists.txt index ab061f169..7f4ca5ed1 100644 --- a/ports/osi/CMakeLists.txt +++ b/ports/osi/CMakeLists.txt @@ -12,9 +12,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if(BUILD_SHARED_LIBS AND MSVC)
- set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif(BUILD_SHARED_LIBS AND MSVC)
+
if(MSVC)
set(
CMAKE_CXX_FLAGS
@@ -36,8 +34,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) option(BUILD_SHARED_LIBS "" ON)
#
-# 设置用于 install 的变量
-#
# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
include(GNUInstallDirs)
diff --git a/ports/osi/CONTROL b/ports/osi/CONTROL index 457085c68..98cfbdcad 100644 --- a/ports/osi/CONTROL +++ b/ports/osi/CONTROL @@ -1,4 +1,4 @@ Source: osi
-Version: 0.107.9-0
-Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.
+Version: 0.107.9-1
+Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.
Build-Depends: coinutils
diff --git a/ports/osi/portfile.cmake b/ports/osi/portfile.cmake index 6cb2e1217..8c890581c 100644 --- a/ports/osi/portfile.cmake +++ b/ports/osi/portfile.cmake @@ -1,45 +1,26 @@ -# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
-include(vcpkg_common_functions)
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO coin-or/Osi
- REF releases/0.107.9
- SHA512 52501e2fa81ad9ec1412596b5945e11f2d5c5c91bdb148f41dad9efb8e4a033cfc2f76e389b9e546593b89ae6c7f74c32e6c5b78337c967ad0c90cd6a7183a28
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- set(BUILD_SHARED_LIBS ON)
-else()
- set(BUILD_SHARED_LIBS OFF)
-endif()
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA # Disable this option if project cannot be built with Ninja
- OPTIONS
- -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Osi")
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME osi)
+include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Osi + REF releases/0.107.9 + SHA512 52501e2fa81ad9ec1412596b5945e11f2d5c5c91bdb148f41dad9efb8e4a033cfc2f76e389b9e546593b89ae6c7f74c32e6c5b78337c967ad0c90cd6a7183a28 +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Osi") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright) |
