Moving the update commands to GIT; Fix problems with foamToTecplot360
This commit is contained in:
parent
7e4a9cbd27
commit
cf802d88a8
6 changed files with 32 additions and 22 deletions
|
@ -112,7 +112,15 @@ SET(
|
||||||
|
|
||||||
# Update section
|
# Update section
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
set (UPDATE_TYPE svn)
|
set (UPDATE_TYPE git)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Using GIT as SCM
|
||||||
|
#
|
||||||
|
find_package(Git)
|
||||||
|
if(GIT_FOUND)
|
||||||
|
message("git found: ${GIT_EXECUTABLE}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Build section
|
# Build section
|
||||||
|
@ -142,7 +150,7 @@ add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests
|
||||||
ENABLE_TESTING()
|
ENABLE_TESTING()
|
||||||
INCLUDE(CTest)
|
INCLUDE(CTest)
|
||||||
|
|
||||||
SET (CTEST_UPDATE_COMMAND "svn")
|
SET (CTEST_UPDATE_COMMAND ${GIT_EXECUTABLE})
|
||||||
|
|
||||||
SET(
|
SET(
|
||||||
CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000
|
CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
## # The following are required to uses Dart and the Cdash dashboard
|
## # The following are required to uses Dart and the Cdash dashboard
|
||||||
## ENABLE_TESTING()
|
## ENABLE_TESTING()
|
||||||
## INCLUDE(CTest)
|
## INCLUDE(CTest)
|
||||||
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext_testing")
|
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext")
|
||||||
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
|
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
|
||||||
|
|
||||||
set(CTEST_DROP_METHOD "http")
|
set(CTEST_DROP_METHOD "http")
|
||||||
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
|
set(CTEST_DROP_SITE "localhost")
|
||||||
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext_testing")
|
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext")
|
||||||
set(CTEST_DROP_SITE_CDASH TRUE)
|
set(CTEST_DROP_SITE_CDASH TRUE)
|
||||||
|
|
|
@ -8,11 +8,17 @@
|
||||||
|
|
||||||
#elif defined(linux)
|
#elif defined(linux)
|
||||||
|
|
||||||
TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DUSEENUM -DTHREED -U_WIN32
|
TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUX64 -DUSEENUM -DTHREED -U_WIN32
|
||||||
|
|
||||||
|
#elif defined(darwinIntel)
|
||||||
|
|
||||||
|
# warning "DarwinIntel architecture detected"
|
||||||
|
|
||||||
|
TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUX64 -DUSEENUM -DTHREED -U_WIN32
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
# error architecture not supported for compiling tecio.
|
#error "architecture not supported for compiling tecio."
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
|
-I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \
|
||||||
-I$(WM_THIRD_PARTY_DIR)/scotch_5.1/src/libscotch/lnInclude \
|
-I$(WM_THIRD_PARTY_DIR)/scotch_5.1/src/libscotch/lnInclude \
|
||||||
-I/usr/include/scotch \
|
-I/usr/include/scotch \
|
||||||
-I../decompositionMethods/lnInclude
|
-I../decompositionMethods/lnInclude
|
||||||
|
|
|
@ -112,7 +112,15 @@ SET(
|
||||||
|
|
||||||
# Update section
|
# Update section
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
set (UPDATE_TYPE svn)
|
set (UPDATE_TYPE git)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Using GIT as SCM
|
||||||
|
#
|
||||||
|
find_package(Git)
|
||||||
|
if(GIT_FOUND)
|
||||||
|
message("git found: ${GIT_EXECUTABLE}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Build section
|
# Build section
|
||||||
|
@ -142,7 +150,7 @@ add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests
|
||||||
ENABLE_TESTING()
|
ENABLE_TESTING()
|
||||||
INCLUDE(CTest)
|
INCLUDE(CTest)
|
||||||
|
|
||||||
SET (CTEST_UPDATE_COMMAND "svn")
|
SET (CTEST_UPDATE_COMMAND ${GIT_EXECUTABLE})
|
||||||
|
|
||||||
SET(
|
SET(
|
||||||
CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000
|
CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
## This file should be placed in the root directory of your project.
|
|
||||||
## Then modify the CMakeLists.txt file in the root directory of your
|
|
||||||
## project to incorporate the testing dashboard.
|
|
||||||
## # The following are required to uses Dart and the Cdash dashboard
|
|
||||||
## ENABLE_TESTING()
|
|
||||||
## INCLUDE(CTest)
|
|
||||||
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext")
|
|
||||||
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
|
|
||||||
|
|
||||||
set(CTEST_DROP_METHOD "http")
|
|
||||||
set(CTEST_DROP_SITE "localhost")
|
|
||||||
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext")
|
|
||||||
set(CTEST_DROP_SITE_CDASH TRUE)
|
|
Reference in a new issue