merge
This commit is contained in:
commit
7d147ed8f1
3 changed files with 17 additions and 17 deletions
|
@ -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")
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue