Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Moved the check for CppTest so that nel_unit_test has it available.

Browse source
This commit is contained in:
"Matt Raykowski" 2010-09-24 14:56:47 -05:00
parent ca4f13daeb
commit b95e0b675a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/CMakeLists.txt
View file

@ -135,6 +135,10 @@ IF(WITH_QT)
ENDIF(WITH_QT) ENDIF(WITH_QT)
IF(WITH_NEL) IF(WITH_NEL)
IF(WITH_NEL_TESTS)
FIND_PACKAGE(CppTest)
ENDIF(WITH_NEL_TESTS)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
ADD_SUBDIRECTORY(nel) ADD_SUBDIRECTORY(nel)
ENDIF(WITH_NEL) ENDIF(WITH_NEL)
@ -159,8 +163,6 @@ IF(BUILD_DOCUMENTATION)
ENDIF(BUILD_DOCUMENTATION) ENDIF(BUILD_DOCUMENTATION)
IF(WITH_NEL_TESTS) IF(WITH_NEL_TESTS)
FIND_PACKAGE(CppTest)
ENABLE_TESTING() ENABLE_TESTING()
ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html) ADD_TEST(nel_unit_test ${EXECUTABLE_OUTPUT_PATH}/nel_unit_test --html)
IF(BUILD_DASHBOARD) IF(BUILD_DASHBOARD)