diff --git a/CMakeLists.txt b/CMakeLists.txt index 5eca7c9a6..d35d50aad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,15 @@ SET( # 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 @@ -142,7 +150,7 @@ add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests ENABLE_TESTING() INCLUDE(CTest) -SET (CTEST_UPDATE_COMMAND "svn") +SET (CTEST_UPDATE_COMMAND ${GIT_EXECUTABLE}) SET( CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000 diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 743c356bb..2d0c5ee84 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -4,10 +4,10 @@ ## # The following are required to uses Dart and the Cdash dashboard ## ENABLE_TESTING() ## 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_DROP_METHOD "http") -set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext_testing") +set(CTEST_DROP_SITE "localhost") +set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext") set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions index f8dcf4875..955469239 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions @@ -8,11 +8,17 @@ #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 -# error architecture not supported for compiling tecio. +#error "architecture not supported for compiling tecio." #endif diff --git a/src/decompositionMethods/scotchDecomp/Make/options b/src/decompositionMethods/scotchDecomp/Make/options index 24c94d4b0..0e9aa5f88 100644 --- a/src/decompositionMethods/scotchDecomp/Make/options +++ b/src/decompositionMethods/scotchDecomp/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/include \ -I$(WM_THIRD_PARTY_DIR)/scotch_5.1/src/libscotch/lnInclude \ -I/usr/include/scotch \ -I../decompositionMethods/lnInclude diff --git a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt b/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt index 5eca7c9a6..d35d50aad 100644 --- a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt +++ b/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt @@ -112,7 +112,15 @@ SET( # 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 @@ -142,7 +150,7 @@ add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests ENABLE_TESTING() INCLUDE(CTest) -SET (CTEST_UPDATE_COMMAND "svn") +SET (CTEST_UPDATE_COMMAND ${GIT_EXECUTABLE}) SET( CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000 diff --git a/testHarness/OpenFOAM/1.6-ext/CTestConfig.cmake b/testHarness/OpenFOAM/1.6-ext/CTestConfig.cmake deleted file mode 100644 index 2d0c5ee84..000000000 --- a/testHarness/OpenFOAM/1.6-ext/CTestConfig.cmake +++ /dev/null @@ -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)