From a941ad638a79a7e9bbaf98f581afeff1966d1dc2 Mon Sep 17 00:00:00 2001 From: "Matt Raykowski\"" Date: Tue, 21 Sep 2010 14:50:10 -0500 Subject: [PATCH] Changed: Altered build to allow CI builds to be submitted to CDash --- code/CMakeLists.txt | 13 +++++++++++++ code/CTestConfig.cmake | 6 +++--- code/nel/CMakeLists.txt | 15 +-------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 7a099dc86..f55e9ef9b 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -158,6 +158,19 @@ IF(BUILD_DOCUMENTATION) ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN} ${CMAKE_BINARY_DIR}/doc/Doxyfile) ENDIF(BUILD_DOCUMENTATION) +IF(WITH_NEL_TESTS) + FIND_PACKAGE(CppTest) + + ENABLE_TESTING() + ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) + IF(BUILD_DASHBOARD) + INCLUDE(Dart) + SET(SVNCOMMAND svn) + SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel) + SET(GENERATELOGS svn2cl) + ENDIF(BUILD_DASHBOARD) +ENDIF(WITH_NEL_TESTS) + # packaging information SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeL MMORPG Framework") SET(CPACK_PACKAGE_VENDOR "NeL") diff --git a/code/CTestConfig.cmake b/code/CTestConfig.cmake index 24fc3db2a..236efcfd2 100644 --- a/code/CTestConfig.cmake +++ b/code/CTestConfig.cmake @@ -4,10 +4,10 @@ ## # The following are required to uses Dart and the Cdash dashboard ## ENABLE_TESTING() ## INCLUDE(Dart) -set(CTEST_PROJECT_NAME "NeL") -set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") +set(CTEST_PROJECT_NAME "RyzomCore") +set(CTEST_NIGHTLY_START_TIME "00:00:00 CST") set(CTEST_DROP_METHOD "http") set(CTEST_DROP_SITE "www.opennel.org") -set(CTEST_DROP_LOCATION "/cdash/submit.php?project=NeL") +set(CTEST_DROP_LOCATION "/cdash/submit.php?project=RyzomCore") set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index 254ceb33f..0f8b4fd75 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -59,19 +59,6 @@ IF(WITH_GTK) FIND_PACKAGE(GTK2) ENDIF(WITH_GTK) -IF(WITH_NEL_TESTS) - FIND_PACKAGE(CppTest) - - ENABLE_TESTING() - ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) - IF(BUILD_DASHBOARD) - INCLUDE(Dart) - SET(SVNCOMMAND svn) - SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel) - SET(GENERATELOGS svn2cl) - ENDIF(BUILD_DASHBOARD) -ENDIF(WITH_NEL_TESTS) - IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) SET(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) @@ -103,4 +90,4 @@ ENDIF(WITH_NEL_SAMPLES) IF(WITH_NEL_TOOLS) FIND_PACKAGE(Squish) ADD_SUBDIRECTORY(tools) -ENDIF(WITH_NEL_TOOLS) \ No newline at end of file +ENDIF(WITH_NEL_TOOLS)