Commit c5f4616f authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'master' into fix/namespace-pollution

parents 85934d6a e8d55fde
Changelog
=========
v4.3.1
------
**Library**:
- Add `THIRDPARTY_USE_SSL` option to disable use of SSL on systems where CMake
is not compiled with SSL support. (!602)
- Fix Homogeneous transform when unshuffling is not used. (!599)
**NekMesh**:
- Fix incorrect link directory on CCMIO library.
v4.3.0
------
**Library:**
......
......@@ -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)
......
......@@ -16,6 +16,8 @@ IF( NEKTAR_USE_CCM )
MARK_AS_ADVANCED(CCMIO_LIBRARY)
ADD_DEFINITIONS(-DNEKTAR_USE_CCM)
FIND_PATH (CCMIO_INCLUDE_DIR ccmio.h)
GET_FILENAME_COMPONENT(CCMIO_LIBRARY_PATH ${CCMIO_LIBRARY} PATH)
LINK_DIRECTORIES(${CCMIO_LIBRARY_PATH})
ELSE()
MESSAGE(FATAL_ERROR "Cound not find ccmio library")
ENDIF()
......
......@@ -501,7 +501,7 @@ namespace Nektar
}
else
{
Vmath::Vcopy(nrows,sortedinarray,1,outarray,1);
Vmath::Vcopy(nrows,sortedoutarray,1,outarray,1);
}
}
......
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