Author: bpetri
Date: Sun Jul 6 11:17:46 2014
New Revision: 1608183
URL: http://svn.apache.org/r1608183
Log:
CELIX-125
moved CodeCoverage include to CMakeCelix
Modified:
incubator/celix/trunk/cmake/CMakeCelix.cmake
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/utils/CMakeLists.txt
Modified: incubator/celix/trunk/cmake/CMakeCelix.cmake
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CMakeCelix.cmake?rev=1608183&r1=1608182&r2=1608183&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CMakeCelix.cmake (original)
+++ incubator/celix/trunk/cmake/CMakeCelix.cmake Sun Jul 6 11:17:46 2014
@@ -28,3 +28,4 @@ include(cmake_celix/Dependencies)
include(cmake_celix/Packaging)
include(cmake_celix/Test)
include(cmake_celix/ApacheRat)
+include(cmake_celix/CodeCoverage)
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1608183&r1=1608182&r2=1608183&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Sun Jul 6 11:17:46 2014
@@ -79,7 +79,6 @@ if (FRAMEWORK)
celix_subproject(FRAMEWORK_TESTS "Option to build the framework tests"
"OFF" DEPS)
if (FRAMEWORK_TESTS)
- include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
find_package(CppUTest REQUIRED)
include_directories(${CPPUTEST_INCLUDE_DIR})
Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1608183&r1=1608182&r2=1608183&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Sun Jul 6 11:17:46 2014
@@ -56,7 +56,6 @@ if (UTILS)
celix_subproject(UTILS-TESTS "Option to build the utilities library tests"
"OFF")
if (UTILS-TESTS)
- include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
find_package(CppUTest REQUIRED)
include_directories(${CUNIT_INCLUDE_DIRS})
