From 960d1c20efbddf5a34ff9ed77379780d56695624 Mon Sep 17 00:00:00 2001 From: "\"Matt Raykowski\"" Date: Fri, 24 Sep 2010 08:50:22 -0500 Subject: [PATCH 1/2] Changed: Fixed the CTest suite for CI and Nightly builds - may not update repo. --- code/CTestConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CTestConfig.cmake b/code/CTestConfig.cmake index 236efcfd2..88db044ea 100644 --- a/code/CTestConfig.cmake +++ b/code/CTestConfig.cmake @@ -6,7 +6,7 @@ ## INCLUDE(Dart) set(CTEST_PROJECT_NAME "RyzomCore") set(CTEST_NIGHTLY_START_TIME "00:00:00 CST") - +set(CTEST_UPDATE_TYPE "hg") set(CTEST_DROP_METHOD "http") set(CTEST_DROP_SITE "www.opennel.org") set(CTEST_DROP_LOCATION "/cdash/submit.php?project=RyzomCore") From d4570fffd51d0c88d4934f48a891649526a56185 Mon Sep 17 00:00:00 2001 From: "\"Matt Raykowski\"" Date: Fri, 24 Sep 2010 08:53:51 -0500 Subject: [PATCH 2/2] Changed: Fixed error in CMake IF() ENDIF() closure for nelmisc --- code/nel/src/misc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index f7a907d91..bfa8af849 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -58,7 +58,7 @@ IF(WITH_PCH AND NOT WITH_STATIC) # acemtp: it's because my gcc is too old and cannot optimize this file # removed the pch or we cannot define -O0 for the rgba specificaly ADD_NATIVE_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.cpp) -ENDIF(WITH_PCH) +ENDIF(WITH_PCH AND NOT WITH_STATIC) NL_GEN_PC(nel-misc.pc) INSTALL(TARGETS nelmisc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)