cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 05:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[hypre] update to 2.11.2

Browse Source
This commit is contained in:
Albert Ziegenhagel 2017-08-08 17:45:09 +02:00
parent 7fd5f3fe7c
commit 3e50c4e481
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/hypre/CONTROL
View File

@ -1,4 +1,4 @@
Source: hypre
Version: 2.11.1
Version: 2.11.2
Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS
Build-Depends: msmpi

25
ports/hypre/fix-root-cmakelists.patch
View File

@ -1,5 +1,5 @@
--- a/CMakeLists.txt Thu Jun 09 15:56:18 2016
+++ b/CMakeLists.txt Wed Jan 04 18:27:54 2017
--- a/CMakeLists.txt Mon Mar 13 21:37:24 2017
+++ b/CMakeLists.txt Sun Aug 06 19:34:00 2017
@@ -1,6 +1,8 @@
cmake_minimum_required (VERSION 2.8.8)
project (hypre)
@ -7,9 +7,9 @@
+include(GenerateExportHeader)
+
# The version number.
set (HYPRE_VERSION 2.11.1)
set (HYPRE_DATE 2016/06/09)
@@ -616,6 +618,8 @@
set (HYPRE_VERSION 2.11.2)
set (HYPRE_DATE 2017/03/13)
@@ -618,6 +620,8 @@
struct_ls/sparse_msg_solve.c
)
@ -18,7 +18,7 @@
# Headers and sources: sstruct_mv
list (APPEND HYPRE_HEADERS
sstruct_mv/HYPRE_sstruct_mv.h
@@ -756,11 +760,11 @@
@@ -758,11 +762,11 @@
find_package (MPI)
if ((MPI_C_FOUND) AND (NOT CMAKE_C_COMPILER STREQUAL MPI_C_COMPILER))
include_directories (${MPI_C_INCLUDE_PATH})
@ -32,14 +32,16 @@
endif ()
endif (NOT HYPRE_SEQUENTIAL)
@@ -802,8 +806,19 @@
endif ()
@@ -807,7 +811,23 @@
add_library (HYPRE ${HYPRE_SOURCES} ${FEI_LIBS})
-
-install (TARGETS HYPRE DESTINATION lib)
+target_link_libraries(HYPRE ${MPI_C_LIBRARIES})
+if(WIN32 AND BUILD_SHARED_LIBS)
+if (NOT HYPRE_SEQUENTIAL)
+ target_link_libraries(HYPRE ${MPI_C_LIBRARIES})
+endif()
+
+if (WIN32 AND BUILD_SHARED_LIBS)
+ set_target_properties(HYPRE PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
@ -51,6 +53,7 @@
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)
+
install (FILES ${HYPRE_HEADERS} DESTINATION include)
# add_subdirectory (test EXCLUDE_FROM_ALL)

8
ports/hypre/portfile.cmake
View File

@ -1,9 +1,9 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hypre-2.11.1/src)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hypre-2.11.2/src)
vcpkg_download_distfile(ARCHIVE
URLS "http://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.1.tar.gz"
FILENAME "hypre-2.11.1.tar.gz"
SHA512 4266c1b5225bcc97781246475100382f4929d7c918c854570a36b90602e8f111a4893cd1c93b95c68305c851898b970dd92ac173efe9211be5bb914d3c3c5d83
URLS "http://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.2.tar.gz"
FILENAME "hypre-2.11.2.tar.gz"
SHA512 a06321028121e5420fa944ce4fae5f9b96e6021ec2802e68ec3c349f19a20543ed7eff774a4735666c5807ce124eb571b3f86757c67e91faa1c683c3f657469f
)
vcpkg_extract_source_archive(${ARCHIVE})