Commit 6a445b2f authored by Michael Turner's avatar Michael Turner

build cadsystem, install correctly

parent fd565608
......@@ -8,7 +8,7 @@ IF(NEKTAR_USE_OCC)
IF (THIRDPARTY_DOWNLOAD_OCC)
IF(WIN32)
message(SEND_ERROR "Cannot use opencascade with netkar++ on windows")
message(SEND_ERROR "Cannot use opencascade with Nektar++ on windows")
ELSEIF(APPLE)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
......@@ -17,17 +17,18 @@ IF(NEKTAR_USE_OCC)
URL http://ae-nektar.ae.ic.ac.uk/~mt4313/OCC680osx64.tgz
URL_MD5 626292523b0691304f0fa271989fbc44
STAMP_DIR ${TPBUILD}/stamp
BINARY_DIR ${TPBUILD}/opencascade-6.8
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/opencascade-6.8
INSTALL_DIR ${TPDIST}
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
INSTALL_COMMAND cp -a ${TPSRC}/opencascade-6.8/i686/lib/. ${TPDIST}/lib/ COMMAND cp -a ${TPSRC}/opencascade-6.8/i686/inc/. ${TPDIST}/include/
)
SET(OCC_LIBS PTKernel TKernel TKMath TKBRep TKIGES TKSTEP TKSTEPAttr TKSTEP209 TKSTEPBase TKShapeSchema TKGeomBase TKGeomAlgo TKG3d TKG2d TKXSBase TKPShape TKTopAlgo)
LINK_DIRECTORIES(${TPSRC}/opencascade-6.8/i686/lib)
INCLUDE_DIRECTORIES(SYSTEM ${TPSRC}/opencascade-6.8/i686/inc)
LINK_DIRECTORIES(${TPDIST}/lib)
INCLUDE_DIRECTORIES(SYSTEM ${TPDIST}/include)
ELSE()
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
......@@ -42,11 +43,12 @@ IF(NEKTAR_USE_OCC)
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
INSTALL_COMMAND INSTALL_COMMAND cp -a ${TPSRC}/opencascade-6.8/i686/lib/. ${TPDIST}/lib/ COMMAND cp -a ${TPSRC}/opencascade-6.8/i686/inc/. ${TPDIST}/include/
)
SET(OCC_LIBS PTKernel TKernel TKMath TKBRep TKIGES TKSTEP TKSTEPAttr TKSTEP209 TKSTEPBase TKShapeSchema TKGeomBase TKGeomAlgo TKG3d TKG2d TKXSBase TKPShape TKTopAlgo)
LINK_DIRECTORIES(${TPSRC}/opencascade-6.8/lib)
INCLUDE_DIRECTORIES(SYSTEM ${TPSRC}/opencascade-6.8/inc)
LINK_DIRECTORIES(${TPDIST}/lib)
INCLUDE_DIRECTORIES(SYSTEM ${TPDIST}/include)
ENDIF()
ENDIF (THIRDPARTY_DOWNLOAD_OCC)
......
......@@ -76,7 +76,7 @@ IF(NEKTAR_USE_SCOTCH)
ENDIF(NEKTAR_USE_SCOTCH)
IF(NEKTAR_USE_MPI)
SET(CommunicationHeaders ${CommunicationHeaders}
SET(CommunicationHeaders ${CommunicationHeaders}
./Communication/CommMpi.h)
SET(CommunicationSources ${CommunicationSources}
./Communication/CommMpi.cpp)
......@@ -84,12 +84,12 @@ ENDIF(NEKTAR_USE_MPI)
SET(FFTHeaders
./FFT/NektarFFT.h
)
)
SET(FFTSources
./FFT/NektarFFT.cpp
)
IF(NEKTAR_USE_FFTW)
SET(FFTHeaders ${FFTHeaders} ./FFT/NekFFTW.h)
SET(FFTSources ${FFTSources} ./FFT/NekFFTW.cpp)
......@@ -141,18 +141,18 @@ SET(FoundationSources
./Foundations/NodalTriEvenlySpaced.cpp
./Foundations/NodalTriFekete.cpp
./Foundations/NodalUtil.cpp
./Foundations/PhysGalerkinProject.cpp
./Foundations/PhysGalerkinProject.cpp
./Foundations/Points.cpp
./Foundations/PolyEPoints.cpp
)
SET(InterpreterHeaders
./Interpreter/AnalyticExpressionEvaluator.hpp
)
./Interpreter/AnalyticExpressionEvaluator.hpp
)
SET(InterpreterSources
./Interpreter/AnalyticExpressionEvaluator.cpp
)
)
SET(KernelHeaders
./Kernel/kernel.h
......@@ -160,7 +160,7 @@ SET(KernelHeaders
SET(KernelSources
./Kernel/kernel.cpp
)
)
SET(LinearAlgebraHeaders
./LinearAlgebra/Arpack.hpp
......@@ -236,16 +236,16 @@ ENDIF(NEKTAR_USING_SMV)
SET(MemoryHeaders
./Memory/ThreadSpecificPool.hpp
./Memory/NekMemoryManager.hpp
./Memory/NekMemoryManager.hpp
)
SET(MemorySources
./Memory/ThreadSpecificPool.cpp
)
)
SET(PolyLibHeaders
./Polylib/Polylib.h
)
)
SET(PolylibSources
./Polylib/Polylib.cpp
......@@ -254,7 +254,7 @@ SET(PolylibSources
SET(TimeIntegrationHeaders
./TimeIntegration/TimeIntegrationScheme.h
./TimeIntegration/TimeIntegrationWrapper.h
)
)
SET(TimeIntegrationSources
./TimeIntegration/TimeIntegrationScheme.cpp
......@@ -312,7 +312,7 @@ SOURCE_GROUP("TimeIntegration Headers" FILES ${TimeIntegrationHeaders})
SOURCE_GROUP("TimeIntegration Sources" FILES ${TimeIntegrationSources})
SOURCE_GROUP("FFT Headers" FILES ${FFTHeaders})
SOURCE_GROUP("FFT Sources" FILES ${FFTSources})
SOURCE_GROUP("FFT Sources" FILES ${FFTSources})
IF(NEKTAR_USE_OCC)
SET(CADSystemSources
......@@ -377,11 +377,15 @@ ADD_DEFINITIONS(-DLIB_UTILITIES_EXPORTS)
ADD_NEKTAR_LIBRARY(LibUtilities lib ${NEKTAR_LIBRARY_TYPE} ${LibUtilitySources} ${LibUtilityHeaders})
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7)
IF(NEKTAR_USE_OCC)
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7 opencascade-6.8)
ELSE()
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7)
ENDIF()
### Libraries needed specifically by LibUtilities ###
### Static libraries do not need to be linked by
### Static libraries do not need to be linked by
# Scotch
IF( NEKTAR_USE_SCOTCH )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE
......@@ -396,7 +400,7 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${METIS_LIB})
IF( NEKTAR_USE_FFTW )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${FFTW_LIBRARY})
ADD_DEPENDENCIES(LibUtilities fftw-3.2.2)
SET_SOURCE_FILES_PROPERTIES(./FFT/NekFFTW.cpp
SET_SOURCE_FILES_PROPERTIES(./FFT/NekFFTW.cpp
PROPERTY COMPILE_FLAGS "-I${FFTW_INCLUDE_DIR}")
ENDIF( NEKTAR_USE_FFTW )
......
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