diff options
| -rw-r--r-- | libkcal/ConfigureChecks.cmake | 4 | ||||
| -rw-r--r-- | libkcal/tests/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libkcal/ConfigureChecks.cmake b/libkcal/ConfigureChecks.cmake index 3b325187b..82e70cdf0 100644 --- a/libkcal/ConfigureChecks.cmake +++ b/libkcal/ConfigureChecks.cmake @@ -16,6 +16,10 @@ if( LIBICAL_FOUND ) if( NOT (LIBICAL_VERSION VERSION_LESS "3.0") ) add_definitions(-DUSE_LIBICAL_3_0) endif( ) + # check for libical >= 1.0 + if( LIBICAL_VERSION VERSION_LESS "1.0" ) + set( LIBICAL_LESS_1_0 1 CACHE INTERNAL "" FORCE ) + endif( ) # check for libical >= 0.46 if( NOT (LIBICAL_VERSION VERSION_LESS "0.46") ) add_definitions(-DUSE_LIBICAL_0_46) diff --git a/libkcal/tests/CMakeLists.txt b/libkcal/tests/CMakeLists.txt index 3f3603d45..4ae85e5ba 100644 --- a/libkcal/tests/CMakeLists.txt +++ b/libkcal/tests/CMakeLists.txt @@ -74,6 +74,12 @@ foreach( _test_name ${_all_tests} ) list( GET ${_test_name} 1 _test_id ) list( GET ${_test_name} 2 _test_search_filter ) file( GLOB_RECURSE _test_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${_test_search_filter} ) + # skip some libical tests if libical < 1.0, due to bug in old libical versions + if( LIBICAL_LESS_1_0 ) + list( REMOVE_ITEM _test_files data/RecurrenceRule/LibICal/LibICal_TestCase15.ics ) + list( REMOVE_ITEM _test_files data/RecurrenceRule/LibICal/LibICal_TestCase54.ics ) + list( REMOVE_ITEM _test_files data/RecurrenceRule/LibICal/LibICal_TestCase55.ics ) + endif( ) foreach( _test_file ${_test_files} ) add_test( ${_test_executable}__${_test_id}__${_test_file}__ |