diff options
| author | Rodrigo Moya <rodrigo.moya@canonical.com> | 2011-03-15 11:57:34 +0100 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo.moya@canonical.com> | 2011-03-15 11:57:34 +0100 |
| commit | 5d3a055f894e4d35561b4a4994d885d9be5b954c (patch) | |
| tree | d4ed2358c70b66a1ebfee684f8cc75cd4f586a64 /tests | |
| parent | 45db67bd84ba4481bcbd3c2cd96aad4be06bebba (diff) | |
| parent | 4687911ee18f09d642d07979e051e10abecc4c7f (diff) | |
Merge from trunk
(bzr r871.5.23)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0ede80f5f..e6aea6e3f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -31,9 +31,9 @@ link_directories (${LIB_PATHS}) include_directories (. .. ../services ${CMAKE_BINARY_DIR}) find_program(GLIB_GENMARSHAL glib-genmarshal) -add_custom_command(OUTPUT ../services/panel-marshal.c - COMMAND ${GLIB_GENMARSHAL} ARGS ../services/panel-marshal.list --body --prefix=panel_marshal > ../services/panel-marshal.c - COMMAND ${GLIB_GENMARSHAL} ARGS ../services/panel-marshal.list --header --prefix=panel_marshal > ../services/panel-marshal.h +add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/services/panel-marshal.c + COMMAND ${GLIB_GENMARSHAL} ARGS ${CMAKE_SOURCE_DIR}/services/panel-marshal.list --body --prefix=panel_marshal > ${CMAKE_SOURCE_DIR}/services/panel-marshal.c + COMMAND ${GLIB_GENMARSHAL} ARGS ${CMAKE_SOURCE_DIR}/services/panel-marshal.list --header --prefix=panel_marshal > ${CMAKE_SOURCE_DIR}/services/panel-marshal.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ../services/panel-marshal.list COMMENT "Generating marshallers") @@ -52,7 +52,7 @@ add_executable (test-unit ../src/ubus-server.h ../services/panel-service.c ../services/panel-service.h - ../services/panel-marshal.c + ${CMAKE_SOURCE_DIR}/services/panel-marshal.c ../src/FavoriteStore.cpp ../src/FavoriteStore.h ../src/FavoriteStoreGSettings.cpp |