diff --git a/CHANGELOG.md b/CHANGELOG.md index e8398bd7d7352c03608ec50f56f6cac311418b51..9318453a7592882792eb3f2e6fccebcf26c203cf 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/cmake/ThirdPartyCCM.cmake b/cmake/ThirdPartyCCM.cmake index 4515515c6ce1728168a9d9e0d590a0269af30d7a..303bd841f60ee9c66f3db27ac48d7d20535061d5 100644 --- a/cmake/ThirdPartyCCM.cmake +++ b/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) diff --git a/utilities/NekMesh/CMakeLists.txt b/utilities/NekMesh/CMakeLists.txt index f1b54d05b55eff526471092e5941af9de28fe956..9bd7c36d303c0aa9d95d9de6cfd357a82ee9a447 100644 --- a/utilities/NekMesh/CMakeLists.txt +++ b/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)