git.iko.soy/unity8
on xenial help sign in
We never need to ld library path the qmenumodel
27a967eAlbert Astals Cid
tests/CMakeLists.txt+2−6
compare with xenial
unifiedsplit
@@ -31,7 +31,7 @@ set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
31
31
32macro(unity8_parse_arguments)
32macro(unity8_parse_arguments)
33 cmake_parse_arguments(U8TEST
33 cmake_parse_arguments(U8TEST
34− "${QMLTEST_OPTIONS};QMENUMODEL;LIGHTDM"
34+ "${QMLTEST_OPTIONS};LIGHTDM"
35 "${QMLTEST_SINGLE}"
35 "${QMLTEST_SINGLE}"
36 "${QMLTEST_MULTI}"
36 "${QMLTEST_MULTI}"
37 ${ARGN}
37 ${ARGN}
@@ -45,17 +45,13 @@ macro(unity8_parse_arguments)
45 )
45 )
46 endif()
46 endif()
47
47
48− if(U8TEST_QMENUMODEL)
49− list(APPEND ld_paths ${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel)
50− endif()
51−
52 if(ld_paths)
48 if(ld_paths)
53 string(REPLACE ";" ":" ld_library_path "${ld_paths}")
49 string(REPLACE ";" ":" ld_library_path "${ld_paths}")
54 set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
50 set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
55 endif()
51 endif()
56
52
57 set(U8TEST_ARGN "${ARGN}")
53 set(U8TEST_ARGN "${ARGN}")
58− list(REMOVE_ITEM U8TEST_ARGN QMENUMODEL LIGHTDM)
54+ list(REMOVE_ITEM U8TEST_ARGN LIGHTDM)
59
55
60 set(environment
56 set(environment
61 UNITY_TESTING=1
57 UNITY_TESTING=1