celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1628378 - in /celix/trunk: CMakeLists.txt cmake/cmake_celix/CodeCoverage.cmake
Date Tue, 30 Sep 2014 09:10:07 GMT
Author: abroekhuis
Date: Tue Sep 30 09:10:07 2014
New Revision: 1628378

URL: http://svn.apache.org/r1628378
Log:
CELIX-156: Fixed CMake warning due to incorrect/old check for coverage target.

Modified:
    celix/trunk/CMakeLists.txt
    celix/trunk/cmake/cmake_celix/CodeCoverage.cmake

Modified: celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/CMakeLists.txt?rev=1628378&r1=1628377&r2=1628378&view=diff
==============================================================================
--- celix/trunk/CMakeLists.txt (original)
+++ celix/trunk/CMakeLists.txt Tue Sep 30 09:10:07 2014
@@ -19,7 +19,6 @@ cmake_minimum_required (VERSION 2.6)
 project (Celix C CXX)
 
 cmake_policy(SET CMP0012 NEW)
-cmake_policy(SET CMP0045 OLD)
 
 #SET(CMAKE_VERBOSE_MAKEFILE ON)
 

Modified: celix/trunk/cmake/cmake_celix/CodeCoverage.cmake
URL: http://svn.apache.org/viewvc/celix/trunk/cmake/cmake_celix/CodeCoverage.cmake?rev=1628378&r1=1628377&r2=1628378&view=diff
==============================================================================
--- celix/trunk/cmake/cmake_celix/CodeCoverage.cmake (original)
+++ celix/trunk/cmake/cmake_celix/CodeCoverage.cmake Tue Sep 30 09:10:07 2014
@@ -67,10 +67,7 @@ ADD_DEFINITIONS(--coverage)
 set(CMAKE_SHARED_LINKER_FLAGS "--coverage")
 set(CMAKE_EXE_LINKER_FLAGS "--coverage")
 
-GET_TARGET_PROPERTY(coverage_def coverage COVERAGE_TARGET_ADDED)
-IF(${coverage_def} MATCHES NOTFOUND)
-
-
+IF(NOT TARGET coverage)
     add_custom_target(coverage
 	    COMMAND ${CMAKE_COMMAND} -E make_directory coverage_results
 	    COMMAND ${GENHTML_PATH} -o coverage_results coverage/*.info.cleaned



Mime
View raw message