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

Merge branch 'fix/NekMesh_CCM_build' into 'master'

Updated to extract directory of libccmio.a

Updated the ThirdPartyCCM.cmake file to add in Link directory and use the get_Filename_component to obtain the directory path if the library is found. This therefore allows the libccmio.a to be correctly linked from a third party location where as previous it was only compiling if the .a files were copied to the dist/lib directory. 

See merge request !600
parents df76da3c ba14f2ed
......@@ -7,6 +7,9 @@ v4.3.1
- Add `THIRDPARTY_USE_SSL` option to disable use of SSL on systems where CMake
is not compiled with SSL support. (!602)
**NekMesh**:
- Fix incorrect link directory on CCMIO library.
v4.3.0
------
**Library:**
......
......@@ -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()
......
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