From bc777e04ca387170c3ebf6afaa492a26bd0357c2 Mon Sep 17 00:00:00 2001 From: Micke Prag Date: Wed, 26 Sep 2012 16:43:19 +0200 Subject: [PATCH] Add cppunit on OS X as well --- telldus-core/tests/CMakeLists.txt | 3 ++- telldus-core/tests/common/CMakeLists.txt | 2 +- telldus-core/tests/service/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/telldus-core/tests/CMakeLists.txt b/telldus-core/tests/CMakeLists.txt index c1c8fa9e..3d78b0c6 100644 --- a/telldus-core/tests/CMakeLists.txt +++ b/telldus-core/tests/CMakeLists.txt @@ -30,6 +30,7 @@ FUNCTION(ADD_SOURCES TARGET PATH) ENDFUNCTION() IF(ENABLE_TESTING) + FIND_LIBRARY(CPPUNIT cppunit) ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(service) @@ -42,7 +43,7 @@ IF(ENABLE_TESTING) ADD_SOURCES(${telldus-service_TARGET} ${CMAKE_SOURCE_DIR}/service) ADD_TEST(cppunit ${CMAKE_CURRENT_BINARY_DIR}/TestRunner) - IF (UNIX AND NOT APPLE) + IF (UNIX) ADD_TEST(cppcheck cppcheck --quiet --error-exitcode=2 ${CMAKE_SOURCE_DIR}) ENDIF() ENDIF() diff --git a/telldus-core/tests/common/CMakeLists.txt b/telldus-core/tests/common/CMakeLists.txt index 4c7fca41..ae52a231 100644 --- a/telldus-core/tests/common/CMakeLists.txt +++ b/telldus-core/tests/common/CMakeLists.txt @@ -4,6 +4,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/common) ADD_LIBRARY(TelldusCommonTests SHARED ${SRCS} ) -TARGET_LINK_LIBRARIES( TelldusCommonTests TelldusCommon ) +TARGET_LINK_LIBRARIES( TelldusCommonTests TelldusCommon ${CPPUNIT} ) ADD_DEPENDENCIES( TelldusCommonTests TelldusCommon ) diff --git a/telldus-core/tests/service/CMakeLists.txt b/telldus-core/tests/service/CMakeLists.txt index 0e795cd8..d43357a0 100644 --- a/telldus-core/tests/service/CMakeLists.txt +++ b/telldus-core/tests/service/CMakeLists.txt @@ -4,6 +4,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) ADD_LIBRARY(TelldusServiceTests SHARED ${SRCS} ) -TARGET_LINK_LIBRARIES( TelldusServiceTests TelldusServiceStatic ) +TARGET_LINK_LIBRARIES( TelldusServiceTests TelldusServiceStatic ${CPPUNIT} ) ADD_DEPENDENCIES( TelldusServiceTests ${telldus-service_TARGET} )