Skip to content

Commit

Permalink
use CMAKE_TLS_VERIFY environment variable
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Jul 31, 2024
1 parent c997fd6 commit 159f27c
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 17 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
CMAKE_INSTALL_PREFIX: ~/local
CMAKE_PREFIX_PATH: ~/local
CMAKE_GENERATOR: Ninja
CMAKE_TLS_VERIFY: true

on:
push:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env:
CTEST_PARALLEL_LEVEL: 0
CMAKE_INSTALL_PREFIX: ~/libs
CMAKE_PREFIX_PATH: ~/libs
CMAKE_TLS_VERIFY: true

on:
push:
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ set(FETCHCONTENT_QUIET no)
FetchContent_Populate(${PROJECT_NAME}
SOURCE_DIR ${PROJECT_SOURCE_DIR}/mumps/${MUMPS_UPSTREAM_VERSION}
URL ${url}
TLS_VERIFY ${CMAKE_TLS_VERIFY}
)

message(VERBOSE "MUMPS ${MUMPS_UPSTREAM_VERSION} source directory: ${mumps_SOURCE_DIR}")
Expand Down
1 change: 0 additions & 1 deletion cmake/scalapack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ set(scalapack_cmake_args
-DCMAKE_Fortran_COMPILER:PATH=${CMAKE_Fortran_COMPILER}
-DBUILD_TESTING:BOOL=off
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_TLS_VERIFY:BOOL=${CMAKE_TLS_VERIFY}
)

file(READ ${CMAKE_CURRENT_LIST_DIR}/libraries.json json)
Expand Down
15 changes: 2 additions & 13 deletions options.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
if(CMAKE_VERSION VERSION_LESS 3.21)
get_property(not_top DIRECTORY PROPERTY PARENT_DIRECTORY)
if(not_top)
set(${PROJECT_NAME}_IS_TOP_LEVEL false)
else()
set(${PROJECT_NAME}_IS_TOP_LEVEL true)
endif()
endif()

option(${PROJECT_NAME}_BUILD_TESTING "Build tests" ${${PROJECT_NAME}_IS_TOP_LEVEL})
option(MUMPS_BUILD_TESTING "Build tests" ${MUMPS_IS_TOP_LEVEL})

option(find_static "Find static libraries for Lapack and Scalapack (default shared then static search)")

Expand Down Expand Up @@ -54,13 +45,11 @@ option(BUILD_COMPLEX16 "Build double precision complex")

# --- other options

option(CMAKE_TLS_VERIFY "Verify TLS certificates" ON)

set_property(DIRECTORY PROPERTY EP_UPDATE_DISCONNECTED true)

set(FETCHCONTENT_UPDATES_DISCONNECTED true)

# this is for convenience of those needing scalapaack, lapack built
if(${${PROJECT_NAME}_IS_TOP_LEVEL} AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
if(MUMPS_IS_TOP_LEVEL AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE "${PROJECT_BINARY_DIR}/local")
endif()
2 changes: 0 additions & 2 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ option(BUILD_COMPLEX "Build single precision complex")
option(BUILD_COMPLEX16 "Build double precision complex")
option(intsize64 "use 64-bit integers in C and Fortran--Scotch must be consistent with MUMPS")

option(CMAKE_TLS_VERIFY "Verify TLS certificates when downloading" ON)

set_property(DIRECTORY PROPERTY EP_UPDATE_DISCONNECTED true)

file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/libraries.json json)
Expand Down

0 comments on commit 159f27c

Please sign in to comment.