Merge
This commit is contained in:
commit
6549c71170
2 changed files with 2 additions and 2 deletions
|
@ -6,7 +6,7 @@
|
||||||
## INCLUDE(Dart)
|
## INCLUDE(Dart)
|
||||||
set(CTEST_PROJECT_NAME "RyzomCore")
|
set(CTEST_PROJECT_NAME "RyzomCore")
|
||||||
set(CTEST_NIGHTLY_START_TIME "00:00:00 CST")
|
set(CTEST_NIGHTLY_START_TIME "00:00:00 CST")
|
||||||
|
set(CTEST_UPDATE_TYPE "hg")
|
||||||
set(CTEST_DROP_METHOD "http")
|
set(CTEST_DROP_METHOD "http")
|
||||||
set(CTEST_DROP_SITE "www.opennel.org")
|
set(CTEST_DROP_SITE "www.opennel.org")
|
||||||
set(CTEST_DROP_LOCATION "/cdash/submit.php?project=RyzomCore")
|
set(CTEST_DROP_LOCATION "/cdash/submit.php?project=RyzomCore")
|
||||||
|
|
|
@ -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
|
# 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
|
# 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)
|
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)
|
NL_GEN_PC(nel-misc.pc)
|
||||||
INSTALL(TARGETS nelmisc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
INSTALL(TARGETS nelmisc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||||
|
|
Loading…
Reference in a new issue