diff options
| author | Robert Tari <robert@tari.in> | 2021-06-16 22:54:43 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-06-21 02:33:06 +0200 |
| commit | 33cd95e61dcb5947e7671a8eb21d67014376495e (patch) | |
| tree | 8b8fc62297a95f6f5a8bbc465f003c8e51733125 /tests/CMakeLists.txt | |
| parent | 4b6ef9d6039078d5ff24ed7e3dd642e2b6faa9fc (diff) | |
| download | libayatana-common-33cd95e61dcb5947e7671a8eb21d67014376495e.tar.gz libayatana-common-33cd95e61dcb5947e7671a8eb21d67014376495e.tar.bz2 libayatana-common-33cd95e61dcb5947e7671a8eb21d67014376495e.zip | |
Skip elipsizing if max characters are 0
- data/org.ayatana.common.gschema.xml.in: Set min value to 0 + update description
- src/utils.c: Include hadling max allowed length of 0
- tests/CMakeLists.txt: Compile schema locally for testing
- tests/tst_utils.cpp: Include handling max allowed length of 0
- po/ayatana-common.pot: Update translation strings
- po/*.po: Update translation strings
fixes https://github.com/AyatanaIndicators/libayatana-common/issues/29
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d0d05c0..4fa6602 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,11 +2,28 @@ find_package(GMock) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-pie") -include_directories( - ${CMAKE_SOURCE_DIR}/src +# gschemas.compiled + +set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "gschemas.compiled") +set_source_files_properties("gschemas.compiled" GENERATED) +execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE) + +add_custom_command( + OUTPUT "gschemas.compiled" + DEPENDS "${CMAKE_BINARY_DIR}/data/org.ayatana.common.gschema.xml" + COMMAND cp -f "${CMAKE_BINARY_DIR}/data/org.ayatana.common.gschema.xml" "${CMAKE_CURRENT_BINARY_DIR}" + COMMAND ${COMPILE_SCHEMA_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}" ) +add_custom_target("gschemas-compiled" ALL DEPENDS "gschemas.compiled") + +# tst_utils + add_executable(tst_utils tst_utils.cpp) +target_compile_definitions(tst_utils PUBLIC SCHEMA_DIR="${CMAKE_CURRENT_BINARY_DIR}") +add_dependencies(tst_utils "gschemas-compiled") +target_include_directories(tst_utils PUBLIC "${CMAKE_SOURCE_DIR}/src") + target_link_libraries(tst_utils ayatana-common ${GLIB_LIBRARIES} @@ -14,4 +31,5 @@ target_link_libraries(tst_utils ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} ) + add_test(TstUtils tst_utils) |