Skip to content

GitLab

Nektar
Nektar
Commit 837c8224 authored by Chris Cantwell's avatar Chris Cantwell
Browse files
Options

Keep ThirdParty source in top level directory, not builds directory.

parent 20213360
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 52 deletions
CMakeLists.txt
View file @ 837c8224
......@@ -156,7 +156,9 @@ INCLUDE (NektarCommon)
# Find Libraries
SET(TPURL http://www.nektar.info/thirdparty)
SET(TPSRC ${CMAKE_BINARY_DIR}/ThirdParty)
SET(TPSRC ${CMAKE_SOURCE_DIR}/ThirdParty)
SET(TPBUILD ${CMAKE_BINARY_DIR}/ThirdParty)
SET(TPDIST ${CMAKE_INSTALL_PREFIX})
IF (NOT EXISTS ${TPSRC})
FILE(MAKE_DIRECTORY ${TPSRC})
ENDIF ()
......
cmake/ThirdPartyBoost.cmake
View file @ 837c8224
......@@ -25,25 +25,29 @@ IF (THIRDPARTY_BUILD_BOOST)
ENDIF(APPLE)
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
URL ${TPURL}/boost_1_49_0.tar.bz2
URL_MD5 "0d202cb811f934282dea64856a175698"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./bootstrap.sh --prefix=${TPSRC}/dist
SOURCE_DIR ${TPSRC}/boost
BINARY_DIR ${TPBUILD}/boost
TMP_DIR ${TPBUILD}/boost-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./bootstrap.sh --prefix=${TPDIST}
BUILD_COMMAND NO_BZIP2=1 ./b2
variant=release
link=shared
include=${TPSRC}/dist/include
linkflags="-L${TPSRC}/dist/lib"
include=${TPDIST}/include
linkflags="-L${TPDIST}/lib"
${BOOST_FLAGS} ${BOOST_LIB_LIST}
--layout=system toolset=${TOOLSET} install
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
#BUILD_IN_SOURCE 1
)
IF (APPLE)
EXTERNALPROJECT_ADD_STEP(boost patch-install-path
COMMAND sed -i ".bak" "s|-install_name \"|&${TPSRC}/dist/lib/|" ${TPSRC}/src/boost/tools/build/v2/tools/darwin.jam
COMMAND sed -i ".bak" "s|-install_name \"|&${TPDIST}/lib/|" ${TPSRC}/boost/tools/build/v2/tools/darwin.jam
DEPENDERS build
DEPENDEES download)
ENDIF (APPLE)
......@@ -82,14 +86,18 @@ IF (THIRDPARTY_BUILD_BOOST)
ELSE ()
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
URL ${TPURL}/boost_1_49_0.tar.bz2
URL_MD5 "0d202cb811f934282dea64856a175698"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND bootstrap.bat --prefix=${TPSRC}/boost
SOURCE_DIR ${TPSRC}/boost
BINARY_DIR ${TPBUILD}/boost
TMP_DIR ${TPBUILD}/boost-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND bootstrap.bat --prefix=${TPDIST}/boost
BUILD_COMMAND b2 --layout=system install
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
#BUILD_IN_SOURCE 1
)
ENDIF ()
ELSE (THIRDPARTY_BUILD_BOOST)
......@@ -108,11 +116,11 @@ ELSE (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time
filesystem system program_options regex )
ELSE ()
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
#SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
#FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
#SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
#FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
SET(BOOST_ROOT ${TPDIST})
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
ENDIF()
ELSE()
......
cmake/ThirdPartyFFTW.cmake
View file @ 837c8224
......@@ -12,16 +12,20 @@ IF( NEKTAR_USE_FFTW )
EXTERNALPROJECT_ADD(
fftw-3.2.2
PREFIX ${TPSRC}
URL ${TPURL}/fftw-3.2.2.tar.gz
URL_MD5 "b616e5c91218cc778b5aa735fefb61ae"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${TPSRC}/src/fftw-3.2.2/configure --prefix=${TPSRC}/dist --quiet --enable-shared --disable-dependency-tracking
SOURCE_DIR ${TPSRC}/fftw-3.2.2
BINARY_DIR ${TPBUILD}/fftw-3.2.2
TMP_DIR ${TPBUILD}/fftw-3.2.2-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${TPSRC}/fftw-3.2.2/configure --prefix=${TPDIST} --quiet --enable-shared --disable-dependency-tracking
)
SET(FFTW_LIB fftw3)
MARK_AS_ADVANCED(FFTW_LIB)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
MESSAGE(STATUS "Build FFTW: ${TPSRC}/dist/lib/lib${FFTW_LIB}.so")
INCLUDE_DIRECTORIES(${TPDIST}/include)
MESSAGE(STATUS "Build FFTW: ${TPDIST}/lib/lib${FFTW_LIB}.so")
ELSE ()
INCLUDE (FindFFTW)
INCLUDE_DIRECTORIES(${FFTW_INCLUDE_DIR})
......
cmake/ThirdPartyMPI.cmake
View file @ 837c8224
......@@ -30,17 +30,21 @@ IF( NEKTAR_USE_MPI )
IF (THIRDPARTY_BUILD_GSMPI)
EXTERNALPROJECT_ADD(
gsmpi-1.2
PREFIX ${TPSRC}
URL ${TPURL}/gsmpi-1.2.tar.bz2
URL_MD5 35901be16791bfdeafa9c4d0e06d189b
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/gsmpi-1.2
BINARY_DIR ${TPBUILD}/gsmpi-1.2
TMP_DIR ${TPBUILD}/gsmpi-1.2-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND
${CMAKE_COMMAND}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_TYPE:STRING=Debug
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist
${TPSRC}/src/gsmpi-1.2
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
${TPSRC}/gsmpi-1.2
)
SET(GSMPI_LIBRARY gsmpi CACHE FILEPATH
"GSMPI path" FORCE)
......@@ -48,8 +52,8 @@ IF( NEKTAR_USE_MPI )
SET(XXT_LIBRARY xxt CACHE FILEPATH
"XXT path" FORCE)
MARK_AS_ADVANCED(XXT_LIBRARY)
MESSAGE(STATUS "Build GSMPI: ${TPSRC}/dist/lib/lib${GSMPI_LIBRARY}.a")
MESSAGE(STATUS "Build XXT: ${TPSRC}/dist/lib/lib${XXT_LIBRARY}.a")
MESSAGE(STATUS "Build GSMPI: ${TPDIST}/lib/lib${GSMPI_LIBRARY}.a")
MESSAGE(STATUS "Build XXT: ${TPDIST}/lib/lib${XXT_LIBRARY}.a")
ELSE (THIRDPARTY_BUILD_GSMPI)
INCLUDE (FindGSMPI)
INCLUDE (FindXXT)
......
cmake/ThirdPartyMetis.cmake
View file @ 837c8224
......@@ -8,21 +8,26 @@ IF (THIRDPARTY_BUILD_METIS)
PREFIX ${TPSRC}
URL ${TPURL}/modmetis-5.1.0_1.tar.bz2
URL_MD5 "6c6816aea0f53db6c71b1d98ed4ad42b"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/modmetis-5.1.0
BINARY_DIR ${TPBUILD}/modmetis-5.1.0
TMP_DIR ${TPBUILD}/modmetis-5.1.0-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
-DCMAKE_C_FLAGS:STRING=-fPIC
-DGKLIB_PATH:PATH=${TPSRC}/src/modmetis-5.1.0/GKlib
${TPSRC}/src/modmetis-5.1.0
-DGKLIB_PATH:PATH=${TPSRC}/modmetis-5.1.0/GKlib
${TPSRC}/modmetis-5.1.0
)
SET(METIS_LIB metis CACHE FILEPATH
"METIS library" FORCE)
MARK_AS_ADVANCED(METIS_LIB)
LINK_DIRECTORIES(${TPSRC}/dist/lib)
INCLUDE_DIRECTORIES(${TPSRC}/dist/include)
MESSAGE(STATUS "Build Metis: ${TPSRC}/dist/lib/lib${METIS_LIB}.a")
LINK_DIRECTORIES(${TPDIST}/lib)
INCLUDE_DIRECTORIES(${TPDIST}/include)
MESSAGE(STATUS "Build Metis: ${TPDIST}/lib/lib${METIS_LIB}.a")
ELSE (THIRDPARTY_BUILD_METIS)
INCLUDE (FindMetis)
ENDIF (THIRDPARTY_BUILD_METIS)
......
cmake/ThirdPartySMV.cmake
View file @ 837c8224
......@@ -4,19 +4,23 @@ IF (THIRDPARTY_BUILD_SMV)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
libsmvf1.0
PREFIX ${TPSRC}
URL ${TPURL}/libsmvf1.0.tar.gz
URL_MD5 "40cad0538acebd4aa83136ef9319150e"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/libsmvf1.0
BINARY_DIR ${TPBUILD}/libsmvf1.0
TMP_DIR ${TPBUILD}/libsmvf1.0-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist ${TPSRC}/src/libsmvf1.0
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST} ${TPSRC}/libsmvf1.0
INSTALL_COMMAND echo "LibSMV compiled successfully"
)
SET(SMV smv CACHE FILEPATH "Path to LibSMV." FORCE)
MARK_AS_ADVANCED(SMV)
LINK_DIRECTORIES(${TPSRC}/dist/lib)
MESSAGE(STATUS "Build LibSMV: ${TPSRC}/dist/lib/lib${SMV}.a")
LINK_DIRECTORIES(${TPDIST}/lib)
MESSAGE(STATUS "Build LibSMV: ${TPDIST}/lib/lib${SMV}.a")
SET(NEKTAR_USING_SMV TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_SMV)
ELSE (THIRDPARTY_BUILD_SMV)
......
cmake/ThirdPartyTinyxml.cmake
View file @ 837c8224
......@@ -6,17 +6,6 @@ OPTION(THIRDPARTY_BUILD_TINYXML
"Build TinyXML library from ThirdParty." ON)
IF (THIRDPARTY_BUILD_TINYXML)
#SET(TINYXML_DIR ${TPSRC}/tinyxml)
#EXTERNALPROJECT_ADD(
# tinyxml
# PREFIX ${TPSRC}/build
# URL ${TPSRC}/tinyxml.tar.bz2
# URL_MD5 "aec842139928e65aa7abdff6de0a09ec"
# CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX: PATH=${TPSRC}/ #build/dist ${TPSRC}/build/src/tinyxml
#)
#SET(TINYXML_LIB ${TPSRC}/build/dist/lib/libtinyxml.so)
#SET(TINYXML_BASE ${TPSRC}/build/src)
# Tiny XML
IF (NOT EXISTS ${TPSRC}/tinyxml_2_4_3.tar.bz2)
FILE(DOWNLOAD ${TPURL}/tinyxml_2_4_3.tar.bz2
......
cmake/ThirdPartyVTK.cmake
View file @ 837c8224
......@@ -13,13 +13,17 @@ IF( NEKTAR_USE_VTK )
# Obviously this is inconvenient for us.
EXTERNALPROJECT_ADD(
vtk-5.10.1
PREFIX ${TPSRC}
URL ${TPURL}/vtk-5.10.1-nek.tar.bz2
URL_MD5 "f4e2c6b848d3873d44479baa9e7e4d35"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release ${TPSRC}/src/vtk-5.10.1
SOURCE_DIR ${TPSRC}/vtk-5.10.1
BINARY_DIR ${TPBUILD}/vtk-5.10.1
TMP_DIR ${TPBUILD}/vtk-5.10.1-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${TPDIST} -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release ${TPSRC}/vtk-5.10.1
)
SET(VTK_DIR ${TPSRC}/dist/lib/vtk-5.10)
SET(VTK_DIR ${TPDIST}/lib/vtk-5.10)
SET(VTK_FOUND 1)
SET(VTK_USE_FILE ${VTK_DIR}/UseVTK.cmake)
INCLUDE (${VTK_DIR}/VTKConfig.cmake)
......
cmake/ThirdPartyZlib.cmake
View file @ 837c8224
......@@ -31,15 +31,19 @@ IF (THIRDPARTY_BUILD_ZLIB)
# Build the Zlib library separately
EXTERNALPROJECT_ADD(
zlib-1.2.7
PREFIX ${TPSRC}
URL ${TPURL}/zlib-1.2.7.tar.gz
URL_MD5 "4a162e0f643232e7e278d59a0603ceb0"
STAMP_DIR ${TPSRC}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/zlib-1.2.7
BINARY_DIR ${TPBUILD}/zlib-1.2.7
TMP_DIR ${TPBUILD}/zlib-1.2.7-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_INSTALL_PREFIX:PATH=${TPSRC}/dist
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
-DCMAKE_C_FLAGS:STRING=-fPIC
${TPSRC}/src/zlib-1.2.7
${TPSRC}/zlib-1.2.7
)
IF (WIN32)
SET(ZLIB_LIBRARY zlib)
......
solvers/IncNavierStokesSolver/Examples/Cyl.xml
View file @ 837c8224
......@@ -3268,7 +3268,7 @@
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> FinalTime =300 </P>
<P> FinalTime = 10 </P>
<P> NumSteps = FinalTime/TimeStep </P>
<P> IO_CheckSteps = 1000 </P>
<P> IO_InfoSteps = 10 </P>
......
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