on xenial help sign in
We never need to ld library path the qmenumodel
commit27a967e80ab9b4922738b0b486d6bb541c335a67 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 19 May 2015, 21:31 (11 years ago) parenta7041b5
1 file changed+2−6
tests/CMakeLists.txt+2−6
tests/CMakeLists.txt+2−6
@@ -31,7 +31,7 @@ set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
3131
3232macro(unity8_parse_arguments)
3333 cmake_parse_arguments(U8TEST
34− "${QMLTEST_OPTIONS};QMENUMODEL;LIGHTDM"
34+ "${QMLTEST_OPTIONS};LIGHTDM"
3535 "${QMLTEST_SINGLE}"
3636 "${QMLTEST_MULTI}"
3737 ${ARGN}
@@ -45,17 +45,13 @@ macro(unity8_parse_arguments)
4545 )
4646 endif()
4747
48− if(U8TEST_QMENUMODEL)
49− list(APPEND ld_paths ${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel)
50− endif()
51−
5248 if(ld_paths)
5349 string(REPLACE ";" ":" ld_library_path "${ld_paths}")
5450 set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
5551 endif()
5652
5753 set(U8TEST_ARGN "${ARGN}")
58− list(REMOVE_ITEM U8TEST_ARGN QMENUMODEL LIGHTDM)
54+ list(REMOVE_ITEM U8TEST_ARGN LIGHTDM)
5955
6056 set(environment
6157 UNITY_TESTING=1