Attachment #306005 for bug #409025




target_link_libraries ( razor-session  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)
INSTALL(TARGETS razor-session RUNTIME DESTINATION bin)

if (NOT DEFINED BUNDLE_XDG_UTILS)
    message(STATUS "*********************************************************************")
    message(STATUS "Bundling our own xdg-utils.")
    message(STATUS "If you have xdg-utils newer than 2012-03-02, you can set -DBUNDLE_XDG_UTILS=No")
    message(STATUS "*********************************************************************")
    set (BUNDLE_XDG_UTILS Yes)
endif (NOT DEFINED BUNDLE_XDG_UTILS)

if (BUNDLE_XDG_UTILS)
    install(PROGRAMS resources/xdg-open resources/xdg-mime DESTINATION lib${LIB_SUFFIX}/razor-xdg-tools)
    add_definitions ( -DPATH_PREPEND=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/razor-xdg-tools\" )
endif (BUNDLE_XDG_UTILS)

install(PROGRAMS src/startrazor DESTINATION bin)

add_subdirectory(config)

Lines 73-80 int main(int argc, char **argv) Link Here

(-)razorqt-session/src/main.cpp (-1 / +3 lines)
73	}	73	}
74	}	74	}
75		75
		76	#ifdef PATH_PREPEND
76	// PATH for out own bundled XDG tools	77	// PATH for out own bundled XDG tools
77	razor_setenv_prepend("PATH", PATH_PREPEND);	78	razor_setenv_prepend("PATH", PATH_PREPEND);
		79	#endif // PATH_PREPEND
		80
78	// special variable for Razor environment menu	81	// special variable for Razor environment menu
79	razor_setenv("XDG_MENU_PREFIX", "razor-");	82	razor_setenv("XDG_MENU_PREFIX", "razor-");
80		83
81	-

Return to bug 409025

Lines 51-58 add_dependencies( razor-session razorqt qtxdg) Link Here

(-)razorqt-session/CMakeLists.txt (-2 / +13 lines)
51	target_link_libraries ( razor-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)	51	target_link_libraries ( razor-session ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} razorqt qtxdg)
52	INSTALL(TARGETS razor-session RUNTIME DESTINATION bin)	52	INSTALL(TARGETS razor-session RUNTIME DESTINATION bin)
53		53
54	install(PROGRAMS resources/xdg-open resources/xdg-mime DESTINATION lib${LIB_SUFFIX}/razor-xdg-tools)	54	if (NOT DEFINED BUNDLE_XDG_UTILS)
55	add_definitions ( -DPATH_PREPEND=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/razor-xdg-tools\" )	55	message(STATUS "*********************************************************************")
		56	message(STATUS "Bundling our own xdg-utils.")
		57	message(STATUS "If you have xdg-utils newer than 2012-03-02, you can set -DBUNDLE_XDG_UTILS=No")
		58	message(STATUS "*********************************************************************")
		59	set (BUNDLE_XDG_UTILS Yes)
		60	endif (NOT DEFINED BUNDLE_XDG_UTILS)
		61
		62	if (BUNDLE_XDG_UTILS)
		63	install(PROGRAMS resources/xdg-open resources/xdg-mime DESTINATION lib${LIB_SUFFIX}/razor-xdg-tools)
		64	add_definitions ( -DPATH_PREPEND=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/razor-xdg-tools\" )
		65	endif (BUNDLE_XDG_UTILS)
		66
56	install(PROGRAMS src/startrazor DESTINATION bin)	67	install(PROGRAMS src/startrazor DESTINATION bin)
57		68
58	add_subdirectory(config)	69	add_subdirectory(config)