diff options
| author | Dario Freddi <dario.freddi@collabora.co.uk> | 2010-09-18 11:03:10 +0200 |
|---|---|---|
| committer | Dario Freddi <dario.freddi@collabora.co.uk> | 2010-09-20 17:03:55 +0200 |
| commit | 8d88a8224535726c1cf6939e4d87823c24509ae1 (patch) | |
| tree | 95abc3cc14981689fe29098ddbf936d8a2e9a247 /cmake | |
| parent | 9cb2e552622d252fd896990dee0a7442e128dca6 (diff) | |
cmake: Fix some stuff in default flags, and create a real check target which does what we want
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/TelepathyDefaults.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/TelepathyDist.cmake | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake index 3615d5a5..aee4ade3 100644 --- a/cmake/modules/TelepathyDefaults.cmake +++ b/cmake/modules/TelepathyDefaults.cmake @@ -19,12 +19,12 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DQT_NO_DEBUG -DQT_NO_CAST_FROM_ASCII") set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline -DENABLE_DEBUG -DQT_NO_CAST_FROM_ASCII") set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline -DENABLE_DEBUG -DQT_NO_CAST_FROM_ASCII") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs -DENABLE_DEBUG -DQT_NO_CAST_FROM_ASCII") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -DENABLE_DEBUG -DQT_NO_CAST_FROM_ASCII") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DQT_NO_DEBUG") set(CMAKE_C_FLAGS_RELEASE "-O2 -DQT_NO_DEBUG") set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline -DENABLE_DEBUG") set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline -DENABLE_DEBUG") - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs -DENABLE_DEBUG") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -DENABLE_DEBUG") set(DISABLE_WERROR 0 CACHE BOOL "compile without -Werror (normally enabled in development builds)") diff --git a/cmake/modules/TelepathyDist.cmake b/cmake/modules/TelepathyDist.cmake index 725fd165..37b7e69c 100644 --- a/cmake/modules/TelepathyDist.cmake +++ b/cmake/modules/TelepathyDist.cmake @@ -38,9 +38,6 @@ add_custom_target(distcheck rm -rf build && mkdir build && cd build && cmake .. COMMENT "Testing successful tarball build") add_dependencies(distcheck dist) -add_custom_target(check) -add_dependencies(check test) - # CPack set(ENABLE_CPACK OFF CACHE BOOL "Enables CPack targets generation") if (ENABLE_CPACK) |