From: Ivailo Monev Date: Fri, 20 Nov 2020 21:21:53 +0000 (+0000) Subject: assume is available X-Git-Tag: 4.12.0~3334 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30697650d59376644dd37c1ec407d08d3202892d;p=kde%2FKatie.git assume is available already used in many places unconditionally Signed-off-by: Ivailo Monev --- diff --git a/CMakeLists.txt b/CMakeLists.txt index da65aedc4..2df67ae6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -352,9 +352,6 @@ add_definitions( # for symbols mangling while unwinding in core component check_include_file_cxx(cxxabi.h HAVE_CXXABI) -# for 3rd party source used in test component -check_include_file(sys/time.h HAVE_SYS_TIME_H) - # stored in qconfig.h.cmake check_type_size(size_t QT_POINTER_SIZE) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index ca7137ddd..c799cd833 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -2,6 +2,9 @@ add_definitions( -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_DATASTREAM + # for 3rd party source + -DTIME_WITH_SYS_TIME=1 + -DHAVE_SYS_TIME_H ) set(EXTRA_TEST_LIBS KtCore) @@ -106,13 +109,6 @@ katie_generate_public("${TEST_PUBLIC_HEADERS}" QtTest) katie_generate_package(KtTest "KtCore") katie_setup_target(KtTest ${TEST_SOURCES} ${TEST_HEADERS}) -# for 3rd party source -if(HAVE_SYS_TIME_H) - add_definitions(-DTIME_WITH_SYS_TIME=1 -DHAVE_SYS_TIME_H) -else() - add_definitions(-DTIME_WITH_SYS_TIME=0) -endif() - add_library(KtTest ${KATIE_TYPE} ${KtTest_SOURCES}) target_link_libraries(KtTest PRIVATE ${EXTRA_TEST_LIBS}) set_target_properties(KtTest PROPERTIES