Changed: Moved the check for CppTest so that nel_unit_test has it available.
This commit is contained in:
parent
c7960efbe4
commit
4afb6c05be
1 changed files with 4 additions and 2 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue