Skip to content

Commit

Permalink
Merge branch 'metis-wheel-fix' into 'master'
Browse files Browse the repository at this point in the history
[wheel] GKlib fix.

See merge request ogs/ogs!4779
  • Loading branch information
bilke committed Oct 30, 2023
2 parents 72e67e3 + 833280a commit d7d3c37
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions scripts/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,10 @@ else()
endif()

if(OGS_BUILD_TESTING OR OGS_BUILD_UTILS)
CPMAddPackage(NAME vtkdiff GITHUB_REPOSITORY ufz/vtkdiff GIT_TAG 9754b4da43c6adfb65d201ed920b5f6ea27b38b9)
CPMAddPackage(
NAME vtkdiff GITHUB_REPOSITORY ufz/vtkdiff
GIT_TAG 9754b4da43c6adfb65d201ed920b5f6ea27b38b9
)
if(vtkdiff_ADDED)
install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin)
endif()
Expand Down Expand Up @@ -351,16 +354,20 @@ CPMAddPackage(

if(OGS_BUILD_UTILS)
if(NOT GUIX_BUILD)
set(_win_metis_options "MSVC FALSE")
set(_metis_options "MSVC FALSE")
if(WIN32)
set(_win_metis_options "MSVC TRUE")
set(_metis_options "MSVC TRUE" "BUILD_SHARED_LIBS OFF")
else()
list(APPEND _metis_options
"CMAKE_C_FLAGS -D_POSIX_C_SOURCE=200809L"
)
endif()
CPMFindPackage(
NAME GKlib
GIT_REPOSITORY https://github.com/KarypisLab/GKlib
GIT_TAG 8bd6bad750b2b0d90800c632cf18e8ee93ad72d7
VERSION 5.1.1
OPTIONS "CMAKE_POLICY_DEFAULT_CMP0042 NEW" ${_win_metis_options}
OPTIONS "CMAKE_POLICY_DEFAULT_CMP0042 NEW" ${_metis_options}
EXCLUDE_FROM_ALL YES
)
CPMFindPackage(
Expand Down

0 comments on commit d7d3c37

Please sign in to comment.