Merge branch 'fix/thridpartyccm' into 'master'

fix missing if in thirdparty ccm

See merge request !802

CHANGELOG.md

@@ -7,6 +7,7 @@ v5.0.0
 - Added in sum factorisation version for pyramid expansions and orthogonal
   expansion in pyramids (!750)
 - Significant overhaul of CMake infrastructure (!770)
+- Fix ThridpartyCCM options (!802)
 
 **NekMesh**:
 - Add feature to read basic 2D geo files as CAD (!731)
@@ -19,10 +20,6 @@ v5.0.0
   rather than a vector (!797)
 - 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**:
 - Add input module for Semtex field files (!777)
 

cmake/ThirdPartyCCM.cmake

@@ -8,6 +8,8 @@
 OPTION(NEKTAR_USE_CCM
    "use CCM star i/o" OFF)
 
+IF(NEKTAR_USE_CCM)
+
 # First search for system ccmioL installs. Hint /usr/local 
 FIND_PATH   (CCMIO_INCLUDE_DIR ccmio.h PATHS /usr/local/include)
 FIND_LIBRARY(CCMIO_LIBRARY NAMES "ccmio" PATHS /usr/local/lib)
@@ -79,3 +81,5 @@ SET(CCMIO_LIBRARIES ccmio adf)
 
 MARK_AS_ADVANCED(CCMIO_INCLUDE_DIR)
 MARK_AS_ADVANCED(CCMIO_LIBRARY)
+
+ENDIF(NEKTAR_USE_CCM)

utilities/NekMesh/CMakeLists.txt

@@ -59,7 +59,7 @@ ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh
     DEPENDS NekMeshUtils FieldUtils)
 
 IF (NEKTAR_USE_CCM)
-   TARGET_LINK_LIBRARIES(NekMesh ${CCMIO_LIBRARIES})
+   TARGET_LINK_LIBRARIES(NekMesh LINK_PRIVATE ${CCMIO_LIBRARIES})
 ENDIF (NEKTAR_USE_CCM)
 
 IF (NEKTAR_USE_VTK)