]>
Commit | Line | Data |
---|---|---|
e86f7c76 JB |
1 | --- elektra-0.8.26/src/bindings/io/uv/CMakeLists.txt.orig 2022-07-03 17:26:38.128916142 +0200 |
2 | +++ elektra-0.8.26/src/bindings/io/uv/CMakeLists.txt 2022-07-03 17:29:36.067952163 +0200 | |
3 | @@ -56,47 +56,5 @@ else () | |
ac08456e JR |
4 | |
5 | install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_UV_LIBRARY}.pc" DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}) | |
6 | ||
7 | - # Build test | |
8 | - set (TESTEXENAME testio_${BINDING_VARIANT}) | |
9 | - | |
10 | - set (TEST_SOURCES $<TARGET_OBJECTS:cframework>) | |
11 | - add_headers (TEST_SOURCES) | |
e86f7c76 JB |
12 | - file (GLOB IO_TEST_SRC_FILES |
13 | - "${CMAKE_SOURCE_DIR}/src/bindings/io/test/test*.c") | |
14 | - list (APPEND TEST_SOURCES | |
15 | - ${IO_TEST_SRC_FILES}) | |
16 | - list (APPEND TEST_SOURCES | |
17 | - "${CMAKE_CURRENT_SOURCE_DIR}/testio_${BINDING_VARIANT}.c") | |
ac08456e JR |
18 | - |
19 | - if (BUILD_FULL OR BUILD_STATIC) | |
e86f7c76 JB |
20 | - list (APPEND TEST_SOURCES |
21 | - $<TARGET_OBJECTS:OBJ_${IO_UV_LIBRARY}>) # add sources for elektra-io-uv for static and full builds | |
ac08456e JR |
22 | - endif () |
23 | - | |
24 | - add_executable (${TESTEXENAME} ${TEST_SOURCES}) | |
e86f7c76 | 25 | - add_dependencies (${TESTEXENAME} kdberrors_generated elektra_error_codes_generated) |
ac08456e | 26 | - |
e86f7c76 JB |
27 | - target_include_directories (${TESTEXENAME} |
28 | - PUBLIC "${CMAKE_SOURCE_DIR}/tests/cframework" | |
29 | - "${libuv_INCLUDE_DIRS}") | |
ac08456e JR |
30 | - |
31 | - target_link_elektra (${TESTEXENAME} elektra-kdb elektra-plugin elektra-io ${IO_UV_LIBRARY} m) | |
32 | - if (BUILD_FULL OR BUILD_STATIC) | |
e86f7c76 | 33 | - target_link_libraries (${TESTEXENAME} "${libuv_LIBRARIES}" m) |
ac08456e JR |
34 | - endif () |
35 | - | |
e86f7c76 | 36 | - if (libuv_VERSION VERSION_LESS "1.0") |
ac08456e JR |
37 | - target_compile_definitions (${TESTEXENAME} PRIVATE "HAVE_LIBUV0") |
38 | - else () | |
39 | - target_compile_definitions (${TESTEXENAME} PRIVATE "HAVE_LIBUV1") | |
40 | - endif () | |
41 | - | |
42 | - add_test (NAME ${TESTEXENAME} | |
43 | - COMMAND "${CMAKE_BINARY_DIR}/bin/${TESTEXENAME}" "${CMAKE_CURRENT_SOURCE_DIR}" | |
44 | - WORKING_DIRECTORY "${WORKING_DIRECTORY}") | |
e86f7c76 JB |
45 | - set_property (TEST ${TESTEXENAME} |
46 | - PROPERTY ENVIRONMENT | |
47 | - "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") | |
ac08456e JR |
48 | - |
49 | add_subdirectory (example) | |
50 | endif () | |
e86f7c76 JB |
51 | --- elektra-0.8.26/src/bindings/io/glib/CMakeLists.txt.orig 2022-07-03 17:26:38.128916142 +0200 |
52 | +++ elektra-0.8.26/src/bindings/io/glib/CMakeLists.txt 2022-07-03 17:29:56.374508820 +0200 | |
53 | @@ -39,42 +39,5 @@ else () | |
ac08456e JR |
54 | |
55 | install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_VARIANT_LIBRARY}.pc" DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}) | |
56 | ||
57 | - # Build test | |
58 | - set (testexename testio_${BINDING_VARIANT}) | |
59 | - | |
60 | - set (TEST_SOURCES $<TARGET_OBJECTS:cframework>) | |
61 | - add_headers (TEST_SOURCES) | |
e86f7c76 JB |
62 | - file (GLOB IO_TEST_SRC_FILES |
63 | - "${CMAKE_SOURCE_DIR}/src/bindings/io/test/test*.c") | |
64 | - list (APPEND TEST_SOURCES | |
65 | - ${IO_TEST_SRC_FILES}) | |
66 | - list (APPEND TEST_SOURCES | |
67 | - "${CMAKE_CURRENT_SOURCE_DIR}/testio_${BINDING_VARIANT}.c") | |
ac08456e JR |
68 | - |
69 | - if (BUILD_FULL OR BUILD_STATIC) # add sources for elektra-io-glib for static and full builds | |
e86f7c76 JB |
70 | - list (APPEND TEST_SOURCES |
71 | - $<TARGET_OBJECTS:OBJ_${IO_VARIANT_LIBRARY}>) | |
ac08456e JR |
72 | - endif () |
73 | - | |
74 | - add_executable (${testexename} ${TEST_SOURCES}) | |
e86f7c76 | 75 | - add_dependencies (${testexename} kdberrors_generated elektra_error_codes_generated) |
ac08456e JR |
76 | - |
77 | - target_include_directories (${testexename} PUBLIC "${CMAKE_SOURCE_DIR}/tests/cframework") | |
e86f7c76 JB |
78 | - target_include_directories (${testexename} |
79 | - PUBLIC SYSTEM | |
80 | - ${GLib_INCLUDE_DIRS}) | |
ac08456e JR |
81 | - |
82 | - target_link_elektra (${testexename} elektra-kdb elektra-plugin elektra-io ${IO_VARIANT_LIBRARY} m) | |
83 | - if (BUILD_FULL OR BUILD_STATIC) | |
e86f7c76 | 84 | - target_link_libraries (${testexename} ${GLib_LIBRARY}) |
ac08456e JR |
85 | - endif () |
86 | - | |
87 | - add_test (NAME ${testexename} | |
88 | - COMMAND "${CMAKE_BINARY_DIR}/bin/${testexename}" "${CMAKE_CURRENT_SOURCE_DIR}" | |
89 | - WORKING_DIRECTORY "${WORKING_DIRECTORY}") | |
e86f7c76 JB |
90 | - set_property (TEST ${testexename} |
91 | - PROPERTY ENVIRONMENT | |
92 | - "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") | |
ac08456e JR |
93 | - |
94 | add_subdirectory (example) | |
95 | endif () | |
96 | --- elektra-0.8.23/CMakeLists.txt~ 2018-05-13 18:57:57.000000000 +0200 | |
97 | +++ elektra-0.8.23/CMakeLists.txt 2021-03-04 23:21:10.222371932 +0100 | |
98 | @@ -85,7 +85,6 @@ | |
99 | ||
100 | add_subdirectory (src) | |
101 | add_subdirectory (examples) | |
102 | - add_subdirectory (benchmarks) | |
103 | ||
104 | if (BUILD_TESTING) | |
105 | add_subdirectory (tests) |