Commit f909553b authored by Michael Turner's avatar Michael Turner
Browse files

renaming of meshconvert to nekmesh

parent b28e51ed
SET(LibrarySubDirs LibUtilities LocalRegions Collections
MultiRegions SpatialDomains StdRegions SolverUtils MeshUtils)
MultiRegions SpatialDomains StdRegions SolverUtils NekMeshUtils)
SET(UnitTestSubDirs UnitTests)
SET(DemoSubDirs Demos)
SET(TimingsSubDirs Timings)
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/CADSystem/CADCurve.h>
#include <NekMeshUtils/CADSystem/CADCurve.h>
using namespace std;
......
......@@ -41,10 +41,10 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
namespace Nektar
{
......
......@@ -35,7 +35,7 @@
#include <sstream>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
using namespace std;
......
......@@ -41,9 +41,9 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
namespace Nektar
{
......
......@@ -40,7 +40,7 @@
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
#include <MeshUtils/CADSystem/CADSystem.h>
#include <NekMeshUtils/CADSystem/CADSystem.h>
using namespace std;
......
......@@ -43,10 +43,10 @@
#include <Standard_Macro.hxx>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <MeshUtils/CADSystem/CADCurve.h>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADCurve.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
namespace Nektar
{
......
......@@ -41,9 +41,9 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
namespace Nektar
{
......
SET(MESHUTILS_SOURCES
SET(NEKMESHUTILS_SOURCES
MeshElements/Mesh.cpp
MeshElements/Element.cpp
MeshElements/BooleanOperators.cpp
......@@ -12,7 +12,7 @@ SET(MESHUTILS_SOURCES
MeshElements/Hexahedron.cpp
)
IF(NEKTAR_USE_MESH)
SET(MESHUTILS_SOURCES ${MESHUTILS_SOURCES}
SET(MESHUTILS_SOURCES ${NEKMESHUTILS_SOURCES}
SurfaceMeshing/CurveMesh.cpp
Octree/Octant.cpp
Octree/Octree.cpp
......@@ -27,7 +27,7 @@ IF(NEKTAR_USE_MESH)
)
ENDIF()
SET(MESHUTILS_HEADERS
SET(NEKMESHUTILS_HEADERS
MeshElements/MeshElements.h
MeshElements/Node.h
MeshElements/Edge.h
......@@ -45,7 +45,7 @@ SET(MESHUTILS_HEADERS
MeshElements/Hexahedron.h
)
IF(NEKTAR_USE_MESH)
SET(MESHUTILS_HEADERS ${MESHUTILS_HEADERS}
SET(NEKMESHUTILS_HEADERS ${NEKMESHUTILS_HEADERS}
Octree/CurvaturePoint.hpp
SurfaceMeshing/CurveMesh.h
Octree/Octant.h
......@@ -59,13 +59,13 @@ IF(NEKTAR_USE_MESH)
ENDIF()
IF(NEKTAR_USE_OCC)
SET(MESHUTILS_SOURCES ${MESHUTILS_SOURCES}
SET(NEKMESHUTILS_SOURCES ${NEKMESHUTILS_SOURCES}
CADSystem/CADSystem.cpp
CADSystem/CADCurve.cpp
CADSystem/CADSurf.cpp
)
SET(MESHUTILS_HEADERS ${MESHUTILS_HEADERS}
SET(NEKMESHUTILS_HEADERS ${NEKMESHUTILS_HEADERS}
CADSystem/CADSystem.h
CADSystem/CADVert.h
CADSystem/CADCurve.h
......@@ -75,23 +75,23 @@ IF(NEKTAR_USE_OCC)
ENDIF(NEKTAR_USE_OCC)
ADD_NEKTAR_LIBRARY(MeshUtils lib ${NEKTAR_LIBRARY_TYPE}
${MESHUTILS_SOURCES} ${MESHUTILS_HEADERS})
TARGET_LINK_LIBRARIES(MeshUtils LINK_PUBLIC SolverUtils)
ADD_NEKTAR_LIBRARY(NekMeshUtils lib ${NEKTAR_LIBRARY_TYPE}
${NEKMESHUTILS_SOURCES} ${NEKMESHUTILS_HEADERS})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC SolverUtils)
IF(NEKTAR_USE_MESH)
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
ENDIF()
IF(NEKTAR_USE_OCC)
SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
SET_TARGET_PROPERTIES(MeshUtils PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${OCC_LIBS})
ADD_DEPENDENCIES(MeshUtils opencascade-6.8)
SET_TARGET_PROPERTIES(NekMeshUtils PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${OCC_LIBS})
ADD_DEPENDENCIES(NekMeshUtils opencascade-6.8)
ENDIF(NEKTAR_USE_OCC)
INSTALL(DIRECTORY ./
DESTINATION ${NEKTAR_INCLUDE_DIR}/MeshUtils
DESTINATION ${NEKTAR_INCLUDE_DIR}/NekMeshUtils
COMPONENT dev
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/ExtLibInterface/TetGenInterface.h>
#include <NekMeshUtils/ExtLibInterface/TetGenInterface.h>
using namespace std;
namespace Nektar{
......
......@@ -44,7 +44,7 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/ExtLibInterface/TriangleInterface.h>
#include <NekMeshUtils/ExtLibInterface/TriangleInterface.h>
#include <sstream>
......
......@@ -49,7 +49,7 @@ extern "C"{
#include <triangle.h>
}
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
......
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