Commit a488095a authored by David Moxey's avatar David Moxey

Update target name to NekMesh and libNekMesh

parent f2929bba
......@@ -274,7 +274,7 @@ ENDMACRO(ADD_NEKTAR_TEST)
# Adds a new NekPy library with the given sources.
#
MACRO(ADD_NEKPY_LIBRARY name)
CMAKE_PARSE_ARGUMENTS(NEKPY "" "DEPENDS" "SOURCES" ${ARGN})
CMAKE_PARSE_ARGUMENTS(NEKPY "" "DEPENDS;LIBDEPENDS" "SOURCES" ${ARGN})
# Create library.
ADD_LIBRARY(_${name} SHARED ${NEKPY_SOURCES})
......@@ -292,8 +292,13 @@ MACRO(ADD_NEKPY_LIBRARY name)
${Boost_SYSTEM_LIBRARY}
${BOOST_PYTHON_LIB}
${BOOST_NUMPY_LIB}
${PYTHON_LIBRARIES}
${name})
${PYTHON_LIBRARIES})
IF (NEKPY_LIBDEPENDS)
TARGET_LINK_LIBRARIES(_${name} ${NEKPY_LIBDEPENDS})
ELSE()
TARGET_LINK_LIBRARIES(_${name} ${name})
ENDIF()
# Install __init__.py files.
SET(TMPOUT "")
......
Subproject commit b5a5fd96a725fc2e919a702f92def1632215fc4e
Subproject commit 0cf563fbfceb4f22321dbd50cbf84b98c58658f1
......@@ -207,36 +207,38 @@ ENDIF()
ADD_DEFINITIONS(-DNEKMESH_EXPORTS)
ADD_NEKTAR_LIBRARY(NekMesh
ADD_NEKTAR_LIBRARY(libNekMesh
SOURCES ${NEKMESH_SOURCES}
HEADERS ${NEKMESH_HEADERS}
DEPENDS LocalRegions
SUMMARY "Nektar++ NekMesh library"
DESCRIPTION "This library provides mesh generation and routines for the NekMesh executable.")
SET_TARGET_PROPERTIES(libNekMesh PROPERTIES OUTPUT_NAME NekMesh)
IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMesh LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMesh LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(NekMesh LINK_PRIVATE ${OCC_LIBRARIES})
TARGET_LINK_LIBRARIES(libNekMesh LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(libNekMesh LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(libNekMesh LINK_PRIVATE ${OCC_LIBRARIES})
ADD_DEPENDENCIES(NekMesh oce-0.17 tetgen-1.5 triangle-1.6)
ADD_DEPENDENCIES(libNekMesh oce-0.17 tetgen-1.5 triangle-1.6)
IF(NEKTAR_USE_CFI)
TARGET_LINK_LIBRARIES(NekMesh LINK_PUBLIC ${CFI_LIBRARY_API})
TARGET_LINK_LIBRARIES(NekMesh LINK_PUBLIC ${CFI_LIBRARY_CXX})
TARGET_LINK_LIBRARIES(libNekMesh LINK_PUBLIC ${CFI_LIBRARY_API})
TARGET_LINK_LIBRARIES(libNekMesh LINK_PUBLIC ${CFI_LIBRARY_CXX})
ENDIF()
ENDIF()
IF (NEKTAR_USE_CCM)
TARGET_LINK_LIBRARIES(NekMesh LINK_PRIVATE ${CCMIO_LIBRARIES})
ADD_DEPENDENCIES(NekMesh libccmio-2.6.1)
TARGET_LINK_LIBRARIES(libNekMesh LINK_PRIVATE ${CCMIO_LIBRARIES})
ADD_DEPENDENCIES(libNekMesh libccmio-2.6.1)
ENDIF (NEKTAR_USE_CCM)
IF (NEKTAR_USE_VTK)
IF (VTK_MAJOR_VERSION LESS 6)
TARGET_LINK_LIBRARIES(NekMesh LINK_PUBLIC vtkCommon vtkIO vtkGraphics)
TARGET_LINK_LIBRARIES(libNekMesh LINK_PUBLIC vtkCommon vtkIO vtkGraphics)
ELSE ()
TARGET_LINK_LIBRARIES(NekMesh LINK_PUBLIC vtkCommonCore vtkIOLegacy)
TARGET_LINK_LIBRARIES(libNekMesh LINK_PUBLIC vtkCommonCore vtkIOLegacy)
ENDIF ()
ENDIF (NEKTAR_USE_VTK)
......
ADD_NEKPY_LIBRARY(NekMesh DEPENDS LocalRegions SOURCES
ADD_NEKPY_LIBRARY(NekMesh DEPENDS LocalRegions LIBDEPENDS libNekMesh SOURCES
NekMesh.cpp
Element.cpp
Mesh.cpp
......
# Don't use macro -- this way we can just link against NekMesh and
# LocalRegions.
ADD_UTILITIES_EXECUTABLE(NekMesh-bin COMPONENT nekmesh
ADD_UTILITIES_EXECUTABLE(NekMesh COMPONENT nekmesh
SOURCES NekMesh.cpp
DEPENDS NekMesh)
SET_TARGET_PROPERTIES(NekMesh-bin
PROPERTIES OUTPUT_NAME NekMesh)
DEPENDS libNekMesh)
# Nektar++
ADD_NEKTAR_TEST(Nektar++/bl_quad)
......
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