Commit 5289d243 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'master' into fix/doxygen-math

parents 7b6eb19c df76da3c
......@@ -3,7 +3,9 @@ Changelog
v4.3.1
------
**Library:**
**Library**:
- Add `THIRDPARTY_USE_SSL` option to disable use of SSL on systems where CMake
is not compiled with SSL support. (!602)
- Fixed a number of documentation issues (!586)
v4.3.0
......
......@@ -154,7 +154,13 @@ ENDIF()
INCLUDE (NektarCommon)
# Set various ThirdParty locations
SET(TPURL https://www.nektar.info/thirdparty)
OPTION(THIRDPARTY_USE_SSL "Use secure HTTP connection to download third-party files." OFF)
IF (THIRDPARTY_USE_SSL)
SET(TPURL https://www.nektar.info/thirdparty)
ELSE()
SET(TPURL http://www.nektar.info/thirdparty)
ENDIF()
SET(TPSRC ${CMAKE_SOURCE_DIR}/ThirdParty)
SET(TPBUILD ${CMAKE_BINARY_DIR}/ThirdParty)
SET(TPDIST ${CMAKE_BINARY_DIR}/ThirdParty/dist)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment