Merge remote-tracking branch 'upstream/master' into feature/boost-std-cleanup

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)

library/LibUtilities/LinearAlgebra/ExplicitInstantiation.h

@@ -66,7 +66,7 @@
     BOOST_PP_COMMA_IF(BOOST_PP_LESS(n, BOOST_PP_SUB(BOOST_PP_ARRAY_SIZE(data), 1)))
 
 #define NEKTAR_CREATE_EXPLICIT_INTSTANTIATION(z, n, data) \
-    template LIB_UTILITIES_EXPORT COCKCOCK \
+    template LIB_UTILITIES_EXPORT \
     BOOST_PP_ARRAY_ELEM(0, BOOST_PP_ARRAY_ELEM(2, data)) BOOST_PP_ARRAY_ELEM(0, data) BOOST_PP_LPAREN()  \
     BOOST_PP_REPEAT(BOOST_PP_ARRAY_SIZE(BOOST_PP_ARRAY_ELEM(3, data)), NEKTAR_PRINT_ARRAY, BOOST_PP_ARRAY_ELEM(3, data)) \
     BOOST_PP_COMMA_IF(BOOST_PP_GREATER(BOOST_PP_ARRAY_SIZE(BOOST_PP_ARRAY_ELEM(3, data)), 0)) \

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)