Commit 58fe23de authored by Spencer Sherwin's avatar Spencer Sherwin

Merge branch 'fix/thridpartyccm' into 'master'

fix missing if in thirdparty ccm

See merge request !802
parents eb8eab36 e996d11f
...@@ -7,6 +7,7 @@ v5.0.0 ...@@ -7,6 +7,7 @@ v5.0.0
- Added in sum factorisation version for pyramid expansions and orthogonal - Added in sum factorisation version for pyramid expansions and orthogonal
expansion in pyramids (!750) expansion in pyramids (!750)
- Significant overhaul of CMake infrastructure (!770) - Significant overhaul of CMake infrastructure (!770)
- Fix ThridpartyCCM options (!802)
**NekMesh**: **NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731) - Add feature to read basic 2D geo files as CAD (!731)
...@@ -19,10 +20,6 @@ v5.0.0 ...@@ -19,10 +20,6 @@ v5.0.0
rather than a vector (!797) rather than a vector (!797)
- Fix inverted triangles and small memory issue in surface meshing (!798) - Fix inverted triangles and small memory issue in surface meshing (!798)
**Library**
- Added in sum factorisation version for pyramid expansions and orthogonal
expansion in pyramids (!750)
**FieldConvert**: **FieldConvert**:
- Add input module for Semtex field files (!777) - Add input module for Semtex field files (!777)
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
OPTION(NEKTAR_USE_CCM OPTION(NEKTAR_USE_CCM
"use CCM star i/o" OFF) "use CCM star i/o" OFF)
IF(NEKTAR_USE_CCM)
# First search for system ccmioL installs. Hint /usr/local # First search for system ccmioL installs. Hint /usr/local
FIND_PATH (CCMIO_INCLUDE_DIR ccmio.h PATHS /usr/local/include) FIND_PATH (CCMIO_INCLUDE_DIR ccmio.h PATHS /usr/local/include)
FIND_LIBRARY(CCMIO_LIBRARY NAMES "ccmio" PATHS /usr/local/lib) FIND_LIBRARY(CCMIO_LIBRARY NAMES "ccmio" PATHS /usr/local/lib)
...@@ -79,3 +81,5 @@ SET(CCMIO_LIBRARIES ccmio adf) ...@@ -79,3 +81,5 @@ SET(CCMIO_LIBRARIES ccmio adf)
MARK_AS_ADVANCED(CCMIO_INCLUDE_DIR) MARK_AS_ADVANCED(CCMIO_INCLUDE_DIR)
MARK_AS_ADVANCED(CCMIO_LIBRARY) MARK_AS_ADVANCED(CCMIO_LIBRARY)
ENDIF(NEKTAR_USE_CCM)
...@@ -59,7 +59,7 @@ ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh ...@@ -59,7 +59,7 @@ ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh
DEPENDS NekMeshUtils FieldUtils) DEPENDS NekMeshUtils FieldUtils)
IF (NEKTAR_USE_CCM) IF (NEKTAR_USE_CCM)
TARGET_LINK_LIBRARIES(NekMesh ${CCMIO_LIBRARIES}) TARGET_LINK_LIBRARIES(NekMesh LINK_PRIVATE ${CCMIO_LIBRARIES})
ENDIF (NEKTAR_USE_CCM) ENDIF (NEKTAR_USE_CCM)
IF (NEKTAR_USE_VTK) IF (NEKTAR_USE_VTK)
......
Markdown is supported
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